This commit was manufactured by cvs2svn to create tagGNOME_PILOT_CONDUITS_2_0_8

'GNOME_PILOT_CONDUITS_2_0_8'.

svn path=/tags/GNOME_PILOT_CONDUITS_2_0_8/; revision=21067

150 files changed, 0 insertions, 43504 deletions

diff --git a/help/.cvsignore b/help/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/help/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/help/C/.cvsignore b/help/C/.cvsignore
deleted file mode 100644
index 282522db03..0000000000
--- a/help/C/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/help/C/Makefile.am b/help/C/Makefile.am
deleted file mode 100644
index e3bb0ae613..0000000000
--- a/help/C/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-figs = \
-	figures/calendar.png			\
-	figures/config-cal.png			\
-	figures/config-mail.png			\
-	figures/contact-editor.png		\
-	figures/contact.png			\
-	figures/exchange-identity.png		\
-	figures/exchange-receive-options.png	\
-	figures/exchange-receive.png		\
-	figures/filter-assist-fig.png		\
-	figures/filter-new-fig.png		\
-	figures/full-1.png			\
-	figures/full-2.png			\
-	figures/full-3.png			\
-	figures/full-4.png			\
-	figures/full-5.png			\
-	figures/full-6.png			\
-	figures/full-7.png			\
-	figures/mail-composer.png		\
-	figures/mail-druid-pic.png		\
-	figures/mail-inbox.png			\
-	figures/mail-threaded.png		\
-	figures/mainwindow-pic.png		\
-	figures/newmsg.png			\
-	figures/outline.png			\
-	figures/print-dest.png			\
-	figures/print-preview.png		\
-	figures/replymsg.png			\
-	figures/schedule.png			\
-	figures/small_desktop.png		\
-	figures/summary.png			\
-	figures/vfolder-createrule-fig.png
-figdir = figures
-docname = evolution-1.4
-lang = C
-omffile = evolution-1.4-C.omf
-entities =	\
-	apx-authors.xml		\
-	apx-bugs.xml		\
-	apx-fdl.xml		\
-	apx-gloss.xml		\
-	apx-gpl.xml		\
-	config-prefs.xml	\
-	config-sync.xml		\
-	legal.xml		\
-	menuref.xml		\
-	preface.xml		\
-	usage-calendar.xml	\
-	usage-contact.xml	\
-	usage-exec-summary.xml	\
-	usage-exchange.xml	\
-	usage-mail-org.xml	\
-	usage-mail.xml		\
-	usage-mainwindow.xml	\
-	usage-print.xml		\
-	usage-sync.xml
-
-include $(top_srcdir)/help/xmldocs.make
-dist-hook: app-dist-hook
diff --git a/help/C/POTFILES.in b/help/C/POTFILES.in
deleted file mode 100644
index d9393e82cc..0000000000
--- a/help/C/POTFILES.in
+++ /dev/null
@@ -1,16 +0,0 @@
-apx-authors.sgml
-apx-bugs.sgml
-apx-gloss.sgml
-config-prefs.sgml
-config-setupassist.sgml
-config-sync.sgml
-evolution.sgml
-menuref.sgml
-preface.sgml
-usage-calendar.sgml
-usage-contact.sgml
-usage-mail.sgml
-usage-mainwindow.sgml
-usage-notes.sgml
-usage-print.sgml
-usage-sync.sgml
diff --git a/help/C/apx-authors.xml b/help/C/apx-authors.xml
deleted file mode 100644
index c600d49804..0000000000
--- a/help/C/apx-authors.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-  <appendix id="authors">
-    <title>Authors</title>
-     <para>
-      <application>Evolution</application> was written by the Ximian
-      Evolution team and numerous other dedicated GNOME programmers.
-      You can see their names by selecting <menuchoice>
-      <guimenu>Help</guimenu> <guimenuitem>About</guimenuitem>
-      </menuchoice> from any Evolution window.
-     </para>
-    <para>
-      The <application>Evolution</application> code owes a great debt
-       to the <application>GNOME-pim</application> and
-       <application>GNOME-Calendar</application> applications, and to
-       <application>KHTMLW</application>.  The developers of
-       <application>Evolution</application> acknowledge the efforts
-       and contributions of all who worked on those projects.
-    </para>
-
-    <para>
-     Ximian would like to thank everyone who helped out with the bug
-     tracking process, particularly Miles Lane, and also the staff of
-     El Pelon Taqueria, on Peterborough St. in Boston, for
-     sustenance.
-    </para>
-
-   <para>
-      For more information please visit the
-      <application>Evolution</application> <ulink
-      url="http://www.ximian.com/products/ximian_evolution/"
-      type="http">Web page</ulink>.  Please send all comments,
-      suggestions, and bug reports to the <ulink
-      url="http://bugzilla.ximian.com" type="http">Ximian bug tracking
-      database</ulink>. Instructions for submitting bug reports can be
-      found on-line at the same location. You can also use the GNOME
-      bug report tool, <command>bug-buddy</command>, to submit your
-      defect reports.
-    </para>
-    <para>
-      This manual was written by Aaron Weber
-      (<email>aaron@ximian.com</email>), Kevin Breit
-      (<email>mrproper@ximian.com</email>) Duncan Mak
-      (<email>duncan@ximian.com</email>) and Ettore Perazzoli
-      (<email>ettore@ximian.com</email>) with the help of the
-      application programmers and the GNOME Documentation
-      Project. Special thanks to Baris Cicek for proofreading.
-    </para>
-    <para>
-       Please file comments and suggestions for this manual as bugs in
-      the Ximian bug tracking system. If you contributed to this
-      project but do not see your name here, please contact Aaron
-      Weber (<email>aaron@ximian.com</email>) and he'll list you.
-    </para>
-      <para>
-       Partial list of Documentation Translators (application
-       translated to 36 additional languages):
-         <itemizedlist>
-            <listitem><para>
-              Daniel Persson for Swedish (.se)
-            </para></listitem>
-          
-            <listitem><para>
-              Hector Garcia Alvarez for Spanish (.es)
-            </para></listitem>
-
-            <listitem><para>
-	    Kjartan Maraas for Norwegian (.no)
-            </para></listitem>
-           </itemizedlist>
-
-         </para>          
-    </appendix>
-
-
-
-
-
diff --git a/help/C/apx-bugs.xml b/help/C/apx-bugs.xml
deleted file mode 100644
index 686305fbce..0000000000
--- a/help/C/apx-bugs.xml
+++ /dev/null
@@ -1,30 +0,0 @@
- <appendix id="bugs">
-   
-  <title>Known bugs and limitations</title>
-  <abstract>
-    <para>
-      Ximian Evolution bug tracking is done at the <ulink
-							  url="http://bugzilla.ximian.com">Ximian bug tracking
-	System</ulink>.  You may use that, or the GNOME <application>Bug
-	Report Tool</application> (known as <command>bug-buddy</command>
-      at the command line) if you find bugs or would like to request new
-      features.
-    </para>
-    <para>
-      If you need additional help with Ximian Evolution, please visit
-      the Ximian support site at <ulink
-					url="http://support.ximian.com">ximian.com/support</ulink>.
-    </para>
-  </abstract>
-  
-
-  <para>
-     A complete list of feature requests and other issues with
-    Evolution is available online in the Ximian bug tracking system.
-    You can learn more about the Ximian Evolution development process
-    at <ulink
-    url="http://developer.ximian.com">developer.ximian.com</ulink>.
-  </para>
-  
-</appendix>
-
diff --git a/help/C/apx-fdl.xml b/help/C/apx-fdl.xml
deleted file mode 100644
index 4af2a495fa..0000000000
--- a/help/C/apx-fdl.xml
+++ /dev/null
@@ -1,667 +0,0 @@
-<!--  
-     The GNU Free Documentation License 1.1 in DocBook
-     Markup by Eric Baudais <baudais@okstate.edu>
-     Maintained by the GNOME Documentation Project
-     http://developer.gnome.org/projects/gdp
-     Version: 1.0.1
-     Last Modified: Nov 16, 2000
--->
-
-<appendix id="apx-fdl">
-  <appendixinfo>
-    <releaseinfo>
-      Version 1.1, March 2000
-    </releaseinfo>
-    <copyright>
-      <year>2000</year><holder>Free Software Foundation, Inc.</holder>
-    </copyright>
-    <legalnotice id="fdl-legalnotice">
-      <para>
-	<address>Free Software Foundation, Inc. <street>59 Temple Place, 
-        Suite 330</street>, <city>Boston</city>, <state>MA</state>  
-        <postcode>02111-1307</postcode>  <country>USA</country></address> 
-	Everyone is permitted to copy and distribute verbatim copies of this 
-        license document, but changing it is not allowed.
-      </para>
-    </legalnotice>
-  </appendixinfo>
-  <title>GNU Free Documentation License</title>
-
-  <sect1 id="fdl-preamble">
-    <title>0. PREAMBLE</title>
-    <para>
-      The purpose of this License is to make a manual, textbook, or
-      other written document <quote>free</quote> in the sense of
-      freedom: to assure everyone the effective freedom to copy and
-      redistribute it, with or without modifying it, either
-      commercially or noncommercially. Secondarily, this License
-      preserves for the author and publisher a way to get credit for
-      their work, while not being considered responsible for
-      modifications made by others.
-    </para>
-    
-    <para>
-      This License is a kind of <quote>copyleft</quote>, which means
-      that derivative works of the document must themselves be free in
-      the same sense. It complements the GNU General Public License,
-      which is a copyleft license designed for free software.
-    </para>
-    
-    <para>
-      We have designed this License in order to use it for manuals for
-      free software, because free software needs free documentation: a
-      free program should come with manuals providing the same
-      freedoms that the software does. But this License is not limited
-      to software manuals; it can be used for any textual work,
-      regardless of subject matter or whether it is published as a
-      printed book. We recommend this License principally for works
-      whose purpose is instruction or reference.
-    </para>
-  </sect1>
-  <sect1 id="fdl-section1">
-    <title>1. APPLICABILITY AND DEFINITIONS</title>
-    <para id="fdl-document">
-      This License applies to any manual or other work that contains a
-      notice placed by the copyright holder saying it can be
-      distributed under the terms of this License. The
-      <quote>Document</quote>, below, refers to any such manual or
-      work. Any member of the public is a licensee, and is addressed
-      as <quote>you</quote>.
-    </para>
-    
-    <para id="fdl-modified">
-      A <quote>Modified Version</quote> of the Document means any work
-      containing the Document or a portion of it, either copied
-      verbatim, or with modifications and/or translated into another
-      language.
-    </para>
-	
-    <para id="fdl-secondary">
-      A <quote>Secondary Section</quote> is a named appendix or a
-      front-matter section of the <link
-      linkend="fdl-document">Document</link> that deals exclusively
-      with the relationship of the publishers or authors of the
-      Document to the Document's overall subject (or to related
-      matters) and contains nothing that could fall directly within
-      that overall subject. (For example, if the Document is in part a
-      textbook of mathematics, a Secondary Section may not explain any
-      mathematics.)  The relationship could be a matter of historical
-      connection with the subject or with related matters, or of
-      legal, commercial, philosophical, ethical or political position
-      regarding them.
-    </para>
-
-    <para id="fdl-invariant">
-      The <quote>Invariant Sections</quote> are certain <link
-      linkend="fdl-secondary"> Secondary Sections</link> whose titles
-      are designated, as being those of Invariant Sections, in the
-      notice that says that the <link
-      linkend="fdl-document">Document</link> is released under this
-      License.
-    </para>
-    
-    <para id="fdl-cover-texts">
-      The <quote>Cover Texts</quote> are certain short passages of
-      text that are listed, as Front-Cover Texts or Back-Cover Texts,
-      in the notice that says that the <link
-      linkend="fdl-document">Document</link> is released under this
-      License.
-    </para>
-	
-    <para id="fdl-transparent">
-      A <quote>Transparent</quote> copy of the <link
-      linkend="fdl-document"> Document</link> means a machine-readable
-      copy, represented in a format whose specification is available
-      to the general public, whose contents can be viewed and edited
-      directly and straightforwardly with generic text editors or (for
-      images composed of pixels) generic paint programs or (for
-      drawings) some widely available drawing editor, and that is
-      suitable for input to text formatters or for automatic
-      translation to a variety of formats suitable for input to text
-      formatters. A copy made in an otherwise Transparent file format
-      whose markup has been designed to thwart or discourage
-      subsequent modification by readers is not Transparent.  A copy
-      that is not <quote>Transparent</quote> is called
-      <quote>Opaque</quote>.
-    </para>
-    
-    <para>
-      Examples of suitable formats for Transparent copies include
-      plain ASCII without markup, Texinfo input format, LaTeX input
-      format, SGML or XML using a publicly available DTD, and
-      standard-conforming simple HTML designed for human
-      modification. Opaque formats include PostScript, PDF,
-      proprietary formats that can be read and edited only by
-      proprietary word processors, SGML or XML for which the DTD
-      and/or processing tools are not generally available, and the
-      machine-generated HTML produced by some word processors for
-      output purposes only.
-    </para>
-    
-    <para id="fdl-title-page">
-      The <quote>Title Page</quote> means, for a printed book, the
-      title page itself, plus such following pages as are needed to
-      hold, legibly, the material this License requires to appear in
-      the title page. For works in formats which do not have any title
-      page as such, <quote>Title Page</quote> means the text near the
-      most prominent appearance of the work's title, preceding the
-      beginning of the body of the text.
-    </para>
-  </sect1>
-    
-  <sect1 id="fdl-section2">
-    <title>2. VERBATIM COPYING</title>
-    <para>
-      You may copy and distribute the <link
-      linkend="fdl-document">Document</link> in any medium, either
-      commercially or noncommercially, provided that this License, the
-      copyright notices, and the license notice saying this License
-      applies to the Document are reproduced in all copies, and that
-      you add no other conditions whatsoever to those of this
-      License. You may not use technical measures to obstruct or
-      control the reading or further copying of the copies you make or
-      distribute. However, you may accept compensation in exchange for
-      copies. If you distribute a large enough number of copies you
-      must also follow the conditions in <link
-      linkend="fdl-section3">section 3</link>.
-    </para>
-    
-    <para>
-      You may also lend copies, under the same conditions stated
-      above, and you may publicly display copies.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section3">
-    <title>3. COPYING IN QUANTITY</title>
-    <para>
-      If you publish printed copies of the <link
-      linkend="fdl-document">Document</link> numbering more than 100,
-      and the Document's license notice requires <link
-      linkend="fdl-cover-texts">Cover Texts</link>, you must enclose
-      the copies in covers that carry, clearly and legibly, all these
-      Cover Texts: Front-Cover Texts on the front cover, and
-      Back-Cover Texts on the back cover. Both covers must also
-      clearly and legibly identify you as the publisher of these
-      copies. The front cover must present the full title with all
-      words of the title equally prominent and visible. You may add
-      other material on the covers in addition. Copying with changes
-      limited to the covers, as long as they preserve the title of the
-      <link linkend="fdl-document">Document</link> and satisfy these
-      conditions, can be treated as verbatim copying in other
-      respects.
-    </para>
-    
-    <para>
-      If the required texts for either cover are too voluminous to fit
-      legibly, you should put the first ones listed (as many as fit
-      reasonably) on the actual cover, and continue the rest onto
-      adjacent pages.
-    </para>
-    
-    <para>
-      If you publish or distribute <link
-      linkend="fdl-transparent">Opaque</link> copies of the <link
-      linkend="fdl-document">Document</link> numbering more than 100,
-      you must either include a machine-readable <link
-      linkend="fdl-transparent">Transparent</link> copy along with
-      each Opaque copy, or state in or with each Opaque copy a
-      publicly-accessible computer-network location containing a
-      complete Transparent copy of the Document, free of added
-      material, which the general network-using public has access to
-      download anonymously at no charge using public-standard network
-      protocols. If you use the latter option, you must take
-      reasonably prudent steps, when you begin distribution of Opaque
-      copies in quantity, to ensure that this Transparent copy will
-      remain thus accessible at the stated location until at least one
-      year after the last time you distribute an Opaque copy (directly
-      or through your agents or retailers) of that edition to the
-      public.
-    </para>
-    
-    <para>
-      It is requested, but not required, that you contact the authors
-      of the <link linkend="fdl-document">Document</link> well before
-      redistributing any large number of copies, to give them a chance
-      to provide you with an updated version of the Document.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section4">
-    <title>4. MODIFICATIONS</title>
-    <para>
-      You may copy and distribute a <link
-      linkend="fdl-modified">Modified Version</link> of the <link
-      linkend="fdl-document">Document</link> under the conditions of
-      sections <link linkend="fdl-section2">2</link> and <link
-      linkend="fdl-section3">3</link> above, provided that you release
-      the Modified Version under precisely this License, with the
-      Modified Version filling the role of the Document, thus
-      licensing distribution and modification of the Modified Version
-      to whoever possesses a copy of it. In addition, you must do
-      these things in the Modified Version:
-    </para>
-    
-    <itemizedlist mark="opencircle">
-      <listitem>
-	<formalpara>
-	  <title>A</title>
-	  <para>
-	    Use in the <link linkend="fdl-title-page">Title
-	    Page</link> (and on the covers, if any) a title distinct
-	    from that of the <link
-	    linkend="fdl-document">Document</link>, and from those of
-	    previous versions (which should, if there were any, be
-	    listed in the History section of the Document). You may
-	    use the same title as a previous version if the original
-	    publisher of that version gives permission.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>B</title>
-	  <para>
-	    List on the <link linkend="fdl-title-page">Title
-	    Page</link>, as authors, one or more persons or entities
-	    responsible for authorship of the modifications in the
-	    <link linkend="fdl-modified">Modified Version</link>,
-	    together with at least five of the principal authors of
-	    the <link linkend="fdl-document">Document</link> (all of
-	    its principal authors, if it has less than five).
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>C</title>
-	  <para>
-	    State on the <link linkend="fdl-title-page">Title
-	    Page</link> the name of the publisher of the <link
-	    linkend="fdl-modified">Modified Version</link>, as the
-	    publisher.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>D</title>
-	  <para>
-	    Preserve all the copyright notices of the <link
-	    linkend="fdl-document">Document</link>.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>E</title>
-	  <para>
-	    Add an appropriate copyright notice for your modifications
-	    adjacent to the other copyright notices.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>F</title>
-	  <para>
-	    Include, immediately after the copyright notices, a
-	    license notice giving the public permission to use the
-	    <link linkend="fdl-modified">Modified Version</link> under
-	    the terms of this License, in the form shown in the
-	    Addendum below.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>G</title>
-	  <para>
-	    Preserve in that license notice the full lists of <link
-	    linkend="fdl-invariant"> Invariant Sections</link> and
-	    required <link linkend="fdl-cover-texts">Cover
-	    Texts</link> given in the <link
-	    linkend="fdl-document">Document's</link> license notice.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>H</title>
-	  <para>
-	    Include an unaltered copy of this License.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>I</title>
-	  <para>
-	    Preserve the section entitled <quote>History</quote>, and
-	    its title, and add to it an item stating at least the
-	    title, year, new authors, and publisher of the <link
-	    linkend="fdl-modified">Modified Version </link>as given on
-	    the <link linkend="fdl-title-page">Title Page</link>.  If
-	    there is no section entitled <quote>History</quote> in the
-	    <link linkend="fdl-document">Document</link>, create one
-	    stating the title, year, authors, and publisher of the
-	    Document as given on its Title Page, then add an item
-	    describing the Modified Version as stated in the previous
-	    sentence.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>J</title>
-	  <para>
-	    Preserve the network location, if any, given in the <link
-	    linkend="fdl-document">Document</link> for public access
-	    to a <link linkend="fdl-transparent">Transparent</link>
-	    copy of the Document, and likewise the network locations
-	    given in the Document for previous versions it was based
-	    on. These may be placed in the <quote>History</quote>
-	    section.  You may omit a network location for a work that
-	    was published at least four years before the Document
-	    itself, or if the original publisher of the version it
-	    refers to gives permission.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>K</title>
-	  <para>
-	    In any section entitled <quote>Acknowledgements</quote> or
-	    <quote>Dedications</quote>, preserve the section's title,
-	    and preserve in the section all the substance and tone of
-	    each of the contributor acknowledgements and/or
-	    dedications given therein.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>L</title>
-	  <para>
-	    Preserve all the <link linkend="fdl-invariant">Invariant
-	    Sections</link> of the <link
-	    linkend="fdl-document">Document</link>, unaltered in their
-	    text and in their titles.  Section numbers or the
-	    equivalent are not considered part of the section titles.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>M</title>
-	  <para>
-	    Delete any section entitled
-	    <quote>Endorsements</quote>. Such a section may not be
-	    included in the <link linkend="fdl-modified">Modified
-	    Version</link>.
-	  </para>
-	</formalpara>
-      </listitem>
-      
-      <listitem>
-	<formalpara>
-	  <title>N</title>
-	  <para>
-	    Do not retitle any existing section as
-	    <quote>Endorsements</quote> or to conflict in title with
-	    any <link linkend="fdl-invariant">Invariant
-	    Section</link>.
-	  </para>
-	</formalpara>
-      </listitem>
-    </itemizedlist>
-    
-    <para>
-      If the <link linkend="fdl-modified">Modified Version</link>
-      includes new front-matter sections or appendices that qualify as
-      <link linkend="fdl-secondary">Secondary Sections</link> and
-      contain no material copied from the Document, you may at your
-      option designate some or all of these sections as invariant. To
-      do this, add their titles to the list of <link
-      linkend="fdl-invariant">Invariant Sections</link> in the
-      Modified Version's license notice.  These titles must be
-      distinct from any other section titles.
-    </para>
-    
-    <para>
-      You may add a section entitled <quote>Endorsements</quote>,
-      provided it contains nothing but endorsements of your <link
-      linkend="fdl-modified">Modified Version</link> by various
-      parties--for example, statements of peer review or that the text
-      has been approved by an organization as the authoritative
-      definition of a standard.
-    </para>
-    
-    <para>
-      You may add a passage of up to five words as a <link
-      linkend="fdl-cover-texts">Front-Cover Text</link>, and a passage
-      of up to 25 words as a <link
-      linkend="fdl-cover-texts">Back-Cover Text</link>, to the end of
-      the list of <link linkend="fdl-cover-texts">Cover Texts</link>
-      in the <link linkend="fdl-modified">Modified Version</link>.
-      Only one passage of Front-Cover Text and one of Back-Cover Text
-      may be added by (or through arrangements made by) any one
-      entity. If the <link linkend="fdl-document">Document</link>
-      already includes a cover text for the same cover, previously
-      added by you or by arrangement made by the same entity you are
-      acting on behalf of, you may not add another; but you may
-      replace the old one, on explicit permission from the previous
-      publisher that added the old one.
-    </para>
-    
-    <para>
-      The author(s) and publisher(s) of the <link
-      linkend="fdl-document">Document</link> do not by this License
-      give permission to use their names for publicity for or to
-      assert or imply endorsement of any <link
-      linkend="fdl-modified">Modified Version </link>.
-    </para>
-  </sect1>
-    
-  <sect1 id="fdl-section5">
-    <title>5. COMBINING DOCUMENTS</title>
-    <para>
-      You may combine the <link linkend="fdl-document">Document</link>
-      with other documents released under this License, under the
-      terms defined in <link linkend="fdl-section4">section 4</link>
-      above for modified versions, provided that you include in the
-      combination all of the <link linkend="fdl-invariant">Invariant
-      Sections</link> of all of the original documents, unmodified,
-      and list them all as Invariant Sections of your combined work in
-      its license notice.
-    </para>
-    
-    <para>
-      The combined work need only contain one copy of this License,
-      and multiple identical <link linkend="fdl-invariant">Invariant
-      Sections</link> may be replaced with a single copy. If there are
-      multiple Invariant Sections with the same name but different
-      contents, make the title of each such section unique by adding
-      at the end of it, in parentheses, the name of the original
-      author or publisher of that section if known, or else a unique
-      number. Make the same adjustment to the section titles in the
-      list of Invariant Sections in the license notice of the combined
-      work.
-    </para>
-    
-    <para>
-      In the combination, you must combine any sections entitled
-      <quote>History</quote> in the various original documents,
-      forming one section entitled <quote>History</quote>; likewise
-      combine any sections entitled <quote>Acknowledgements</quote>,
-      and any sections entitled <quote>Dedications</quote>.  You must
-      delete all sections entitled <quote>Endorsements.</quote>
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section6">
-    <title>6. COLLECTIONS OF DOCUMENTS</title>
-    <para>
-      You may make a collection consisting of the <link
-      linkend="fdl-document">Document</link> and other documents
-      released under this License, and replace the individual copies
-      of this License in the various documents with a single copy that
-      is included in the collection, provided that you follow the
-      rules of this License for verbatim copying of each of the
-      documents in all other respects.
-    </para>
-    
-    <para>
-      You may extract a single document from such a collection, and
-      dispbibute it individually under this License, provided you
-      insert a copy of this License into the extracted document, and
-      follow this License in all other respects regarding verbatim
-      copying of that document.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section7">
-    <title>7. AGGREGATION WITH INDEPENDENT WORKS</title>
-    <para>
-      A compilation of the <link
-      linkend="fdl-document">Document</link> or its derivatives with
-      other separate and independent documents or works, in or on a
-      volume of a storage or distribution medium, does not as a whole
-      count as a <link linkend="fdl-modified">Modified Version</link>
-      of the Document, provided no compilation copyright is claimed
-      for the compilation.  Such a compilation is called an
-      <quote>aggregate</quote>, and this License does not apply to the
-      other self-contained works thus compiled with the Document , on
-      account of their being thus compiled, if they are not themselves
-      derivative works of the Document.  If the <link
-      linkend="fdl-cover-texts">Cover Text</link> requirement of <link
-      linkend="fdl-section3">section 3</link> is applicable to these
-      copies of the Document, then if the Document is less than one
-      quarter of the entire aggregate, the Document's Cover Texts may
-      be placed on covers that surround only the Document within the
-      aggregate. Otherwise they must appear on covers around the whole
-      aggregate.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section8">
-    <title>8. TRANSLATION</title>
-    <para>
-      Translation is considered a kind of modification, so you may
-      distribute translations of the <link
-      linkend="fdl-document">Document</link> under the terms of <link
-      linkend="fdl-section4">section 4</link>. Replacing <link
-      linkend="fdl-invariant"> Invariant Sections</link> with
-      translations requires special permission from their copyright
-      holders, but you may include translations of some or all
-      Invariant Sections in addition to the original versions of these
-      Invariant Sections. You may include a translation of this
-      License provided that you also include the original English
-      version of this License. In case of a disagreement between the
-      translation and the original English version of this License,
-      the original English version will prevail.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section9">
-    <title>9. TERMINATION</title>
-    <para>
-      You may not copy, modify, sublicense, or distribute the <link
-      linkend="fdl-document">Document</link> except as expressly
-      provided for under this License. Any other attempt to copy,
-      modify, sublicense or distribute the Document is void, and will
-      automatically terminate your rights under this License. However,
-      parties who have received copies, or rights, from you under this
-      License will not have their licenses terminated so long as such
-      parties remain in full compliance.
-    </para>
-    </sect1>
-    
-  <sect1 id="fdl-section10">
-    <title>10. FUTURE REVISIONS OF THIS LICENSE</title>
-    <para>
-      The <ulink type="http"
-      url="http://www.gnu.org/fsf/fsf.html">Free Software
-      Foundation</ulink> may publish new, revised versions of the GNU
-      Free Documentation License from time to time. Such new versions
-      will be similar in spirit to the present version, but may differ
-      in detail to address new problems or concerns. See <ulink
-      type="http"
-      url="http://www.gnu.org/copyleft">http://www.gnu.org/copyleft/</ulink>.
-    </para>
-    
-    <para>
-      Each version of the License is given a distinguishing version
-      number. If the <link linkend="fdl-document">Document</link>
-      specifies that a particular numbered version of this License
-      <quote>or any later version</quote> applies to it, you have the
-      option of following the terms and conditions either of that
-      specified version or of any later version that has been
-      published (not as a draft) by the Free Software Foundation. If
-      the Document does not specify a version number of this License,
-      you may choose any version ever published (not as a draft) by
-      the Free Software Foundation.
-    </para>
-  </sect1>
-
-  <sect1 id="fdl-using">
-    <title>Addendum</title>
-    <para>
-      To use this License in a document you have written, include a copy of
-      the License in the document and put the following copyright and
-      license notices just after the title page:
-    </para>
-    
-    <blockquote>
-      <para>
-	Copyright YEAR YOUR NAME.
-      </para>
-      <para>
-	Permission is granted to copy, distribute and/or modify this
-	document under the terms of the GNU Free Documentation
-	License, Version 1.1 or any later version published by the
-	Free Software Foundation; with the <link
-	linkend="fdl-invariant">Invariant Sections</link> being LIST
-	THEIR TITLES, with the <link
-	linkend="fdl-cover-texts">Front-Cover Texts</link> being LIST,
-	and with the <link linkend="fdl-cover-texts">Back-Cover
-	Texts</link> being LIST.  A copy of the license is included in
-	the section entitled <quote>GNU Free Documentation
-	License</quote>.
-      </para>
-    </blockquote>
-      
-    <para>
-      If you have no <link linkend="fdl-invariant">Invariant
-      Sections</link>, write <quote>with no Invariant Sections</quote>
-      instead of saying which ones are invariant.  If you have no
-      <link linkend="fdl-cover-texts">Front-Cover Texts</link>, write
-      <quote>no Front-Cover Texts</quote> instead of
-      <quote>Front-Cover Texts being LIST</quote>; likewise for <link
-      linkend="fdl-cover-texts">Back-Cover Texts</link>.
-    </para>
-    
-    <para>
-      If your document contains nontrivial examples of program code,
-      we recommend releasing these examples in parallel under your
-      choice of free software license, such as the <ulink type="http"
-      url="http://www.gnu.org/copyleft/gpl.html"> GNU General Public
-      License</ulink>, to permit their use in free software.
-    </para>
-  </sect1>
-</appendix>  
-
-
diff --git a/help/C/apx-gloss.xml b/help/C/apx-gloss.xml
deleted file mode 100644
index d4f12e1a4c..0000000000
--- a/help/C/apx-gloss.xml
+++ /dev/null
@@ -1,480 +0,0 @@
-<glossary id="apx-gloss">
-  
-  <title>Glossary</title>
-  
-  <glossentry id="assistant">
-    <glossterm>Assistant:</glossterm>
-    <glossdef>
-      <para>
-            A tool which guides a user through a series of steps,
-    usually to configure or set up a program.  Equivalent to "Wizard"
-    and "Druid."
-      </para>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="attachment">
-  <glossterm>Attachment:</glossterm>
-  <glossdef>
-   <para>
-    Any file sent along with an email.  Attachments may be embedded in
-    a message or appended to it.
-   </para>
-  </glossdef>
- </glossentry>
-
-<glossentry id="automatic-indexing">
-  <glossterm>Automatic Indexing:</glossterm>
-  <glossdef>
-   <para>
-     Pre-fetching procedure that allows
-     <application>Evolution</application> to refer to data quickly.
-     It enables faster searches and decreases memory usage for
-     data displays.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="bcc">
-  <glossterm>Bcc (Blind Carbon Copy):</glossterm>
-  <glossdef>
-   <para>
-    A way of addressing a message.  Bcc is used to send a group of
-    people an e-mail, while hiding their names and addresses from each
-    other.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="cc">
-  <glossterm>Cc (Carbon Copy):</glossterm>
-  <glossdef>
-   <para>
-    Carbon-copies are used to send a 3rd party a copy of the e-mail,
-    so they an keep up to date on a conversation, without being in the
-    To: list.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="conduit">
-  <glossterm>Conduit:</glossterm>
-  <glossdef>
-   <para>
-     A small application which controls
-     the transfer of data between a handheld device and a desktop
-     computer.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="druid">
-  <glossterm>Druid:</glossterm>
-  <glossdef>
-   <para>
-     See "Assistant."
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="evolution">
-  <glossterm>Evolution:</glossterm>
-  <glossdef>
-   <para>
-    <application>Evolution</application> is the <acronym> GNOME
-    </acronym> groupware application.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="execute">
-  <glossterm>Execute:</glossterm>
-  <glossdef>
-   <para>
-    To run a program.  Any file that can be run is called an
-    executable.  <application>Evolution</application> can download
-    executable attachments, but before they can be run, the files must
-    be marked as executable with a shell or file manager.  This
-    security precaution prevents the automatic or accidental execution
-    of malicious programs. For more information on executables and file
-    permissions, see the documentation for your file manager or shell.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="expunge">
-  <glossterm>Expunge:</glossterm>
-  <glossdef>
-   <para>
-     When messages are marked for deletion, they remain till they are expunged.
-     When a message is expunged, it is permanently deleted, as long as it was
-     marked for deletion.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="filetree">
-  <glossterm>File Tree:</glossterm>
-  <glossdef>
-   <para>
-     A way of describing a group of files on a computer.  With the
-     perversity typical of computer (and especially Unix and Linux)
-     nomenclature, the top of the tree is called the root directory,
-     and denoted by <filename>/</filename>.
-     The rest of the "branches" spread downward from the root.  Don't
-     confuse the root directory with the root
-     account, or root's home directory, normally
-     <filename>/root</filename>.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="filter">
-  <glossterm>Filter:</glossterm>
-  <glossdef>
-   <para>
-    Within <application>Evolution</application>, a filter is a method
-    of sorting mail automatically when it's downloaded.  You can create filters to perform
-    one or more actions on a message that meets any (or all) of a wide
-    range of criteria.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="forward">
-  <glossterm>Forward:</glossterm>
-  <glossdef>
-   <para>
-    If you get a message intended for someone else, you can use
-    message forwarding to send it on to the right person. 
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="groupware">
- <glossterm>Groupware:</glossterm>
-  <glossdef>
-   <para>
-    Groupware is a term describing an application which helps groups
-    of people work together.  Typically, a groupware application will
-    have several productivity features built into one program,
-    including: email, calendar, and addressbook tools.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="html">
-  <glossterm>HTML:</glossterm>
-  <glossdef>
-   <para>
-    Hyper-text Markup Language (<acronym>HTML</acronym>) is a language
-    for describing page layout in electronic documents like web pages,
-    help files, and email messages.  HTML can be used in email and
-    news posts to insert images and apply text treatments.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="hot-key">
-  <glossterm>Hot Key:</glossterm>
-  <glossdef>
-   <para>
-    Hot-keys are keyboard combinations used to do actions on a
-    computer instead of using the mouse.
-    Hot-keys can speed up computer usage.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="ical">
-  <glossterm>iCal:</glossterm>
-  <glossdef>
-   <para>
-    <application>iCal</application> is the program which
-    <application>Evolution</application> uses to manage the calendar
-    section.
-   </para>
-  </glossdef>
- </glossentry> 
-
- <glossentry id="imap">
-  <glossterm>IMAP:</glossterm>
-  <glossdef>
-   <para>
-    Depending upon whom you ask, IMAP stands for the Internet Mail
-    Access Protocol, or the Interim Mail Access Protocol.  It allows access to email which is typically (although
-    not always) stored remotely on a server rather than on a local
-    hard disk.  Often contrasted with <glossterm>POP:</glossterm>.
-    This will not be on the test.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="inline">
-  <glossterm>Inline:</glossterm>
-  <glossdef>
-   <para>
-     Displayed as part of a message or other document, rather than
-     attached as a separate file. Contrast with <glossterm
-     linkend="attachment">Attachment:</glossterm>.
-   </para>
-  </glossdef>
- </glossentry>
- 
-  <glossentry id="ldap">
-   <glossterm>LDAP:</glossterm>
-   <glossdef>
-    <para>
-     LDAP, the Lightweight Directory Access Protocol, allows a client
-     to search through a large database of addresses, phone numbers,
-     and people stored on a server.
-    </para>
-   </glossdef>
-  </glossentry>
-
-  <glossentry id="mail-client">
-    <glossterm>Mail Client:</glossterm>
-    <glossdef>
-      <para>
-	A mail client is the application with which a person reads and
-	sends e-mail.  Its counterparts are the various types of mail
-	servers, which handle user authentication and direct messages from
-	sender to recipient.
-      </para>
-    </glossdef>
-  </glossentry>
-
-
- <glossentry id="minicard">
-  <glossterm>Minicard:</glossterm>
-  <glossdef>
-   <para>
-      A format for the display of contact data.  Similar in appearance
-      to a small business card.
-   </para>
-  </glossdef>
- </glossentry> 
-
- <glossentry id="nautilus">
-  <glossterm>Nautilus:</glossterm>
-  <glossdef>
-   <para>
-    <application>Nautilus</application> is the next generation file
-    manager for <acronym>GNOME</acronym>.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="pop">
-  <glossterm>POP:</glossterm>
-  <glossdef>
-   <para>
-     POP, the Post Office Protocol, is a mechanism for email
-     transport.  In contrast to IMAP, it is used only to get mail from
-     a server and store it locally on your hard disk.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="protocol">
-  <glossterm>Protocol:</glossterm>
-  <glossdef>
-   <para>
-     An agreed-upon method of communication, especially one for
-     sending particular types of information between computer systems.
-     Examples include POP (Post Office Protocol), for email, and HTTP
-     (HypterText Transfer Protocol), for web pages.
-   </para>
-  </glossdef>
- </glossentry>
-
-  <glossentry id="postscript">
-    <glossterm>Postscript:</glossterm>
-    <glossdef>
-      <para>
-	A standard document publishing format.  Many printers read raw
-	Postscript, making Postscript quite versatile.
-      </para>
-    </glossdef>
-  </glossentry>
-  
- <glossentry id="public-key-encryption">
-  <glossterm>Public Key Encryption:</glossterm>
-  <glossdef>
-   <para>
-     A strong encryption method that uses a set of two "keys," one of
-     which is made public, and one of which is kept private. Data
-     encrypted using the public key can only be decrypted using the
-     private key.  The longer the keys, the more difficult it is to
-     break the encryption.
-   </para>
-  </glossdef>
- </glossentry>
-
-
-
- <glossentry id="regular-expression">
-  <glossterm>Regular Expression:</glossterm>
-  <glossdef>
-   <para>
-      A regular expression, or "regex", is a way of describing a
-      string of text using metacharacters or wild-card symbols.  For
-      example, the statement <userinput>fly.*so[au]p</userinput> means
-      "any phrase beginning with 'fly' and ending in 'soup' or
-      'soap'".  If you searched for that expression, you'd find both
-      "fly in my soup" and "fly in my soap."  There's not room here to
-      go into depth, but if you want, have a look at the documentation
-      for the <command>grep</command> command by opening a command
-      line and typing in <command>man grep</command>.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="script">
-  <glossterm>Script:</glossterm>
-  <glossdef>
-   <para>
-    A program written in an interpreted (rather than compiled)
-    language.  Often used as a synonym for "macro," to denote a series
-    of pre-recorded commands or actions within an application.  Often
-    times,  accomplish repetitive and tedious tasks, to save the
-    user time.
-   </para>
-  </glossdef>
- </glossentry>
-
-  <glossentry id="search-base">
-    <glossterm>Search Base:</glossterm>
-    <glossdef>
-      <para>
-	LDAP can break contact lists into many groups.  The Search
-	Base tells LDAP the top group to use.  How much of the Search
-	Base that is searched is set by the <glossterm
-	linkend="search-scope">Search Scope</glossterm> option.
-      </para>
-    </glossdef>
-  </glossentry>
-
-  <glossentry id="search-scope">
-    <glossterm>Search Scope:</glossterm>
-    <glossdef>
-      <para>
-	Search Scope states how much of the <glossterm
-	linkend="search-base">Search Base</glossterm> to search.
-      </para>
-    </glossdef>
-  </glossentry>
-  
-  <glossentry id="sendmail">
-    <glossterm>Sendmail:</glossterm>
-    <glossdef>
-      <para>
-	As its name implies, <application>sendmail</application> is a
-	program which sends mail.  <application>Evolution</application>
-	can use it instead of <glossterm>SMTP:</glossterm>; some people
-	prefer it because it offers more flexibility, but is more
-	difficult to set up.
-      </para>
-    </glossdef>
-  </glossentry>
-  
-
-  <glossentry id="shortcut-bar">
-    <glossterm>Shortcut Bar:</glossterm>
-    <glossdef>
-      <para>
-	A portion of <application>Evolution</application> which offers
-	users fast access to the most frequently used portions of the
-	application.
-      </para>
-    </glossdef>
-  </glossentry>
-  
-  <glossentry id="signature">
-   <glossterm>Signature:</glossterm>
-   <glossdef>
-    <para>
-     In email terms, a signature is a piece of text placed at the end
-     of every email sent, similar to a hand-written signature at the bottom
-     of a written letter.  A signature can be anything from a favorite
-     quotation to a link to a web page; courtesy dictates that it be
-     fewer than four lines long.
-    </para>
-   </glossdef>
-  </glossentry> 
-
-  <glossentry id="smtp">
-   <glossterm>SMTP:</glossterm>
-   <glossdef>
-    <para>
-      This is the most common way of transporting mail messages from
-      the client's computer (you) to the server. SMTP stands for
-      Simple Mail Transfer Protocol.
-    </para>
-   </glossdef>
-  </glossentry> 
-  
-  <glossentry id="tooltip">
-    <glossterm>Tool-Tip:</glossterm>
-    <glossdef>
-      <para>
-	A small box of explanatory text which appears when the mouse
-	pointer is held motionless over a button or other interface
-	element.
-      </para>
-    </glossdef>
-  </glossentry>
-
- <glossentry id="virus">
-  <glossterm>Virus:</glossterm>
-  <glossdef>
-   <para>
-    A program which inserts itself into other files or programs and
-    which, when executed, spreads to more programs and other
-    computers.  A virus can cause substantial damage by clogging
-    networks or disk drives, deleting files, or opening security
-    holes.
-   </para>
-  </glossdef>
- </glossentry>
-
-  <glossentry id="vcard">
-    <glossterm>VCard:</glossterm>
-    <glossdef>
-      <para>
-	A file format for the exchange of contact information. When you
-	get an address card attached to an email, it's probably in VCard
-	format.  Not to be confused with <glossterm
-	linkend="vfolder">vFolder:</glossterm>.
-      </para>
-    </glossdef>
-  </glossentry>
-  
- <glossentry id="vfolder">
-  <glossterm>vFolder:</glossterm>
-  <glossdef>
-   <para>
-    An email organization tool. vFolders allows you to create a folder
-    that contains the results of a complex search. vFolder contents are
-    are updated dynamically.
-   </para>
-  </glossdef>
- </glossentry>
-
-</glossary>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/help/C/apx-gpl.xml b/help/C/apx-gpl.xml
deleted file mode 100644
index ffb4930fb0..0000000000
--- a/help/C/apx-gpl.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-
- <appendix id="apx-gpl">
-
-<title>GNU General Public License</title>
-<para>
-Copyright (c) 2000 Free Software Foundation, Inc.
-         <address>Free Software Foundation, Inc. 
-           <street>59 Temple Place, Suite 330</street>, 
-           <city>Boston</city>, 
-           <state>MA</state> <postcode>02111-1307</postcode>
-           <country>USA</country>
-         </address>.
-       </para>
-
-<para>
-This is version 2 
-</para>
-
-       <para>
-        Everyone is permitted to copy and distribute verbatim copies
-        of this license document, but changing it is not allowed.
-      </para>
-   
-
-    <sect1 id="preamble">
-      <title>Preamble</title>
-      
-      <para>
-        The licenses for most software are designed to take away your 
-        freedom to share and change it. By contrast, the GNU General Public 
-        License is intended to guarantee your freedom to share and change 
-        free software - to make sure the software is free for all its users. 
-        This General Public License applies to most of the Free Software 
-        Foundation's software and to any other program whose authors commit 
-        to using it. (Some other Free Software Foundation software is covered 
-        by the GNU Library General Public License instead.) You can apply it 
-        to your programs, too.
-      </para>
-  
-      <para>
-        When we speak of free software, we are referring to freedom, not price. 
-        Our General Public Licenses are designed to make sure that you have the 
-        freedom to distribute copies of free software (and charge for this 
-        service if you wish), that you receive source code or can get it if you 
-        want it, that you can change the software or use pieces of it in new free 
-        programs; and that you know you can do these things.
-      </para>
-  
-      <para>
-        To protect your rights, we need to make restrictions that forbid anyone 
-        to deny you these rights or to ask you to surrender the rights. These 
-        restrictions translate to certain responsibilities for you if you distribute 
-        copies of the software, or if you modify it.
-      </para>
-  
-      <para>
-        For example, if you distribute copies of such a program, whether gratis or 
-        for a fee, you must give the recipients all the rights that you have. You 
-        must make sure that they, too, receive or can get the source code. And you 
-        must show them these terms so they know their rights.
-      </para>
-  
-      <para>
-        We protect your rights with two steps:
-  
-        <orderedlist numeration="arabic">
-          <listitem>
-            <para>
-              copyright the software, and
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              offer you this license which gives you legal permission to copy, 
-              distribute and/or modify the software.
-            </para>
-          </listitem>
-        </orderedlist>
-      </para>
- 
-     <para>
-       Also, for each author's protection and ours, we want to make certain that 
-       everyone understands that there is no warranty for this free software. If 
-       the software is modified by someone else and passed on, we want its 
-       recipients to know that what they have is not the original, so that any 
-       problems introduced by others will not reflect on the original authors' 
-       reputations.
-     </para>
- 
-     <para>
-       Finally, any free program is threatened constantly by software patents. 
-       We wish to avoid the danger that redistributors of a free program will 
-       individually obtain patent licenses, in effect making the program 
-       proprietary. To prevent this, we have made it clear that any patent must be 
-       licensed for everyone's free use or not licensed at all.
-     </para>
- 
-     <para>
-       The precise terms and conditions for copying, distribution and modification 
-       follow.
-     </para>
- 
-   </sect1>
- 
-   <sect1 id="terms">
-     <title>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</title>
- 
-     <sect2 id="sect0">
-       <title>Section 0</title>
-       <para>
-         This License applies to any program or other work which contains a notice 
-         placed by the copyright holder saying it may be distributed under the terms 
-         of this General Public License. The "Program", below, refers to any such 
-         program or work, and a <quote>work based on the Program</quote> means either 
-         the Program or any derivative work under copyright law: that is to say, a 
-         work containing the Program or a portion of it, either verbatim or with 
-         modifications and/or translated into another language. (Hereinafter, translation 
-         is included without limitation in the term <quote>modification</quote>.) Each 
-         licensee is addressed as <quote>you</quote>.
-       </para>
- 
-       <para>
-         Activities other than copying, distribution and modification are not covered by 
-         this License; they are outside its scope. The act of running the Program is not 
-         restricted, and the output from the Program is covered only if its contents 
-         constitute a work based on the Program (independent of having been made by running 
-         the Program). Whether that is true depends on what the Program does.
-       </para>
-     </sect2>
- 
-     <sect2 id="sect1">
-       <title>Section 1</title>
-       <para>
-         You may copy and distribute verbatim copies of the Program's source code as you 
-         receive it, in any medium, provided that you conspicuously and appropriately 
-         publish on each copy an appropriate copyright notice and disclaimer of warranty; 
-         keep intact all the notices that refer to this License and to the absence of any 
-         warranty; and give any other recipients of the Program a copy of this License 
-         along with the Program.
-       </para>
-       
-       <para>
-         You may charge a fee for the physical act of transferring a copy, and you may at 
-         your option offer warranty protection in exchange for a fee.
-       </para>
-     </sect2>
- 
-     <sect2 id="sect2">
-       <title>Section 2</title>
-       <para>
-         You may modify your copy or copies of the Program or any portion of it, thus 
-         forming a work based on the Program, and copy and distribute such modifications 
-         or work under the terms of <link linkend="sect1">Section 1</link> above, provided 
-         that you also meet all of these conditions:
- 
-         <orderedlist numeration="loweralpha">
-           <listitem>
-             <para>
-               You must cause the modified files to carry prominent notices stating that 
-               you changed the files and the date of any change.
-             </para>
-           </listitem>
-           <listitem>
-             <para>
-               You must cause any work that you distribute or publish, that in whole or 
-               in part contains or is derived from the Program or any part thereof, to be 
-               licensed as a whole at no charge to all third parties under the terms of 
-               this License.
-             </para>
-           </listitem>
-           <listitem>
-             <para>
-               If the modified program normally reads commands interactively when run, you 
-               must cause it, when started running for such interactive use in the most 
-               ordinary way, to print or display an announcement including an appropriate 
-               copyright notice and a notice that there is no warranty (or else, saying 
-               that you provide a warranty) and that users may redistribute the program 
-               under these conditions, and telling the user how to view a copy of this 
-               License. 
- 
-               <note>
-                 <title>Exception:</title>
-                 <para>
-                   If the Program itself is interactive but does not normally print such an 
-                   announcement, your work based on the Program is not required to print an 
-                   announcement.) 
-                 </para>
-               </note>
- 
-             </para>
-           </listitem>
-         </orderedlist>
-       </para>
- 
-       <para>
-         These requirements apply to the modified work as a whole. If identifiable sections 
-         of that work are not derived from the Program, and can be reasonably considered 
-         independent and separate works in themselves, then this License, and its terms, 
-         do not apply to those sections when you distribute them as separate works. But when 
-         you distribute the same sections as part of a whole which is a work based on the 
-         Program, the distribution of the whole must be on the terms of this License, whose 
-         permissions for other licensees extend to the entire whole, and thus to each and 
-         every part regardless of who wrote it.
-       </para>
- 
-       <para>
-         Thus, it is not the intent of this section to claim rights or contest your rights 
-         to work written entirely by you; rather, the intent is to exercise the right to control 
-         the distribution of derivative or collective works based on the Program.
-       </para>
- 
-       <para>
-         In addition, mere aggregation of another work not based on the Program with the Program 
-         (or with a work based on the Program) on a volume of a storage or distribution medium 
-         does not bring the other work under the scope of this License.
-       </para>
-     </sect2>
- 
-     <sect2 id="sect3">
-       <title>Section 3</title>
- 
-       <para>
-         You may copy and distribute the Program (or a work based on it, under 
-         <link linkend="sect2">Section 2</link> in object code or executable form under the terms of 
-         <link linkend="sect1">Sections 1</link> and <link linkend="sect2">2</link> above provided that 
-         you also do one of the following:
- 
-         <orderedlist numeration="loweralpha">
-           <listitem>
-             <para>
-               Accompany it with the complete corresponding machine-readable source code, which 
-
-               must be distributed under the terms of Sections 1 and 2 above on a medium 
-               customarily used for software interchange; or,
-             </para>
-           </listitem>
-           <listitem>
-             <para>
-               Accompany it with a written offer, valid for at least three years, to give any 
-               third party, for a charge no more than your cost of physically performing source 
-               distribution, a complete machine-readable copy of the corresponding source code, 
-               to be distributed under the terms of Sections  and  above on a medium customarily 
-               used for software interchange; or,
-             </para>
-           </listitem>
-           <listitem>
-             <para>
-               Accompany it with the information you received as to the offer to distribute 
-               corresponding source code. (This alternative is allowed only for noncommercial 
-               distribution and only if you received the program in object code or executable form 
-               with such an offer, in accord with Subsection b above.)
-             </para>
-           </listitem>
-         </orderedlist>
-       </para>
- 
-       <para>
-         The source code for a work means the preferred form of the work for making modifications 
-         to it. For an executable work, complete source code means all the source code for all modules 
-         it contains, plus any associated interface definition files, plus the scripts used to control 
-         compilation and installation of the executable. However, as a special exception, the source 
-         code distributed need not include anything that is normally distributed (in either source or 
-         binary form) with the major components (compiler, kernel, and so on) of the operating system 
-         on which the executable runs, unless that component itself accompanies the executable.
-       </para>
-       
-       <para>
-         If distribution of executable or object code is made by offering access to copy from a 
-         designated place, then offering equivalent access to copy the source code from the same place 
-         counts as distribution of the source code, even though third parties are not compelled to 
-         copy the source along with the object code.
-       </para>
-     </sect2>
- 
-     <sect2 id="sect4">
-       <title>Section 4</title>
-       
-       <para>
-         You may not copy, modify, sublicense, or distribute the Program except as expressly provided 
-         under this License. Any attempt otherwise to copy, modify, sublicense or distribute the 
-         Program is void, and will automatically terminate your rights under this License. However, 
-         parties who have received copies, or rights, from you under this License will not have their 
-         licenses terminated so long as such parties remain in full compliance.
-       </para>
-     </sect2>
- 
-     <sect2 id="sect5">
-       <title>Section 5</title>
- 
-       <para>
-         You are not required to accept this License, since you have not signed it. However, nothing 
-         else grants you permission to modify or distribute the Program or its derivative works. 
-         These actions are prohibited by law if you do not accept this License. Therefore, by modifying 
-         or distributing the Program (or any work based on the Program), you indicate your acceptance 
-         of this License to do so, and all its terms and conditions for copying, distributing or 
-         modifying the Program or works based on it.
-       </para>
-     </sect2>
- 
-     <sect2 id="sect6">
-       <title>Section 6</title>
- 
-       <para>
-         Each time you redistribute the Program (or any work based on the Program), the recipient 
-         automatically receives a license from the original licensor to copy, distribute or modify 
-         the Program subject to these terms and conditions. You may not impose any further restrictions 
-         on the recipients' exercise of the rights granted herein. You are not responsible for enforcing 
-         compliance by third parties to this License.
-       </para>
-     </sect2>
- 
-     <sect2 id="sect7">
-       <title>Section 7</title>
- 
-       <para>
-         If, as a consequence of a court judgment or allegation of patent infringement or for any other 
-         reason (not limited to patent issues), conditions are imposed on you (whether by court order, 
-         agreement or otherwise) that contradict the conditions of this License, they do not excuse you 
-         from the conditions of this License. If you cannot distribute so as to satisfy simultaneously 
-         your obligations under this License and any other pertinent obligations, then as a consequence 
-         you may not distribute the Program at all. For example, if a patent license would not permit 
-         royalty-free redistribution of the Program by all those who receive copies directly or 
-         indirectly through you, then the only way you could satisfy both it and this License would be 
-         to refrain entirely from distribution of the Program.
-       </para>
- 
-       <para>
-         If any portion of this section is held invalid or unenforceable under any particular circumstance, 
-         the balance of the section is intended to apply and the section as a whole is intended to apply 
-         in other circumstances.
-       </para>
- 
-       <para>
-         It is not the purpose of this section to induce you to infringe any patents or other property 
-         right claims or to contest validity of any such claims; this section has the sole purpose of 
-         protecting the integrity of the free software distribution system, which is implemented by public 
-         license practices. Many people have made generous contributions to the wide range of software 
-         distributed through that system in reliance on consistent application of that system; it is up 
-         to the author/donor to decide if he or she is willing to distribute software through any other 
-         system and a licensee cannot impose that choice.
-       </para>
- 
-       <para>
-         This section is intended to make thoroughly clear what is believed to be a consequence of the 
-         rest of this License.
-       </para>
-     </sect2>
- 
-     <sect2 id="sect8">
-       <title>Section 8</title>
- 
-       <para>
-         If the distribution and/or use of the Program is restricted in certain countries either by patents 
-         or by copyrighted interfaces, the original copyright holder who places the Program under this License 
-         may add an explicit geographical distribution limitation excluding those countries, so that 
-         distribution is permitted only in or among countries not thus excluded. In such case, this License 
-         incorporates the limitation as if written in the body of this License.
-       </para>
-     </sect2>
- 
-     <sect2 id="sect9">
-       <title>Section 9</title>
-       
-       <para>
-         The Free Software Foundation may publish revised and/or new versions of the General Public License 
-         from time to time. Such new versions will be similar in spirit to the present version, but may differ 
-         in detail to address new problems or concerns.
-       </para>
- 
-       <para>
-         Each version is given a distinguishing version number. If the Program specifies a version number of 
-         this License which applies to it and "any later version", you have the option of following the terms 
-         and conditions either of that version or of any later version published by the Free Software 
-         Foundation. If the Program does not specify a version number of this License, you may choose any 
-         version ever published by the Free Software Foundation.
-       </para>
-     </sect2>
- 
-     <sect2 id="sect10">
-       <title>Section 10</title>
- 
-       <para>
-         If you wish to incorporate parts of the Program into other free programs whose distribution 
-         conditions are different, write to the author to ask for permission. For software which is copyrighted 
-         by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions 
-         for this. Our decision will be guided by the two goals of preserving the free status of all 
-         derivatives of our free software and of promoting the sharing and reuse of software generally.
-       </para>
-     </sect2>
- 
-  <sect2 id="sect11">
-       <title>NO WARRANTY</title>
-       <subtitle>Section 11</subtitle>
- 
-       <para>
-         BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT 
-         PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR 
-         OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, 
-         INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
-         PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE 
-         PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-       </para>
-     </sect2>
- 
-     <sect2 id="sect12">
-       <title>Section 12</title>
- 
-       <para>
-         IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR 
-         ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU 
-         FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE 
-         USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED 
-         INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH 
-         ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH 
-         DAMAGES.
-       </para>
-     </sect2>
-   </sect1>
- </appendix>
\ No newline at end of file
diff --git a/help/C/config-prefs.xml b/help/C/config-prefs.xml
deleted file mode 100644
index c783cd8ede..0000000000
--- a/help/C/config-prefs.xml
+++ /dev/null
@@ -1,1111 +0,0 @@
-<chapter id="config-prefs">
-
-      <title>Advanced Configuration</title>
-      <para>
-        Perhaps your mail server has changed names.  Perhaps you've
-        grown tired of a certain layout for your appointments.
-        Whatever the reason, you want to change your
-        <application>Evolution</application> settings.  This chapter
-        will tell you how to do just that.
-      </para>
-      <para>
-        Evolution 1.2 brings with it a redesigned comprehensive
-        settings window that you can open by choosing <menuchoice>
-        <guimenu>Tools</guimenu>
-        <guimenuitem>Settings</guimenuitem></menuchoice>, no matter
-        where you are in Evolution. On the left half of the settings
-        window is a column, similar to the Evolution shortcut bar,
-        which lets you choose which portion of Evolution to
-        customize. The right half of the window is where you'll make
-        your actual changes.
-      </para>
-
-
-      <!-- ==============Figure===================== -->
-      <figure id="config-prefs-mail-fig">
-	<title>Changing Mail Settings</title>
-	<screenshot>
-	  <screeninfo>Changing Mail Settings</screeninfo>
-	  <mediaobject><imageobject><imagedata fileref="figures/config-mail" format="PNG" srccredit="Aaron Weber"/>
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-      <!-- ==============End of Figure================-->
-
-  <para>
-    There are eight items you can customize. From top to bottom, they
-    are:
-    <variablelist>
-      <varlistentry>
-	<term>Mail Accounts</term>
-	<listitem>
-	  <para>
-             Here, add or change information about your email
-             accounts: the servers to which you connect, the way you
-             download mail, your password authentication mode, and so
-             forth. This is the most complex item in the list, and is
-             covered in <xref linkend="config-prefs-mail-identity"/>.
-          </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>Folder Settings</term>
-	<listitem>
-	  <para>
-             Here, you can choose the default folders for various
-             components of Evolution, the folders that will be cached
-             locally when you go to offline mode, and the folders that
-             Evolution will use when it is searching for
-             autocompletion information as you address a mail.
-          </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>Mail Preferences</term>
-	<listitem>
-	  <para>
-             These are overall mail reading preferences: display
-             settings, notification options, security, and so
-            forth. Settings that vary per-account are in the Mail
-            Accounts tool, described in <xref
-            linkend="config-prefs-mail-identity"/>, but most of the
-            mail settings are here.
-          </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>Composer Preferences</term>
-	<listitem>
-	  <para>
-             Settings for the way that you use the mail composer:
-             shortcuts, signatures, spelling, and so forth. One fun
-             feature here is the ability to substitute graphical
-             smiley-faces for "emoticons" such as :) that many people
-             use in email. This tool is covered in <xref
-             linkend="config-prefs-mail-composer"/>.
-          </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>Calendar and Tasks</term>
-	<listitem>
-	  <para>
-             Here, you can set the way the calendar behaves, including
-             your time zone and the length of your work-week.
-          </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>Exchange Delegation</term>
-	<listitem>
-	  <para>
-            This item will only appear if you have Ximian Connector
-            for Microsoft Exchange installed. It will allow you to
-            choose who has access to your Exchange account. This
-            feature is covered in <xref linkend="exchange-delegate" />.
-          </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>Directory Servers</term>
-	<listitem>
-	  <para>
-             This item allows you to enter account information for
-            connecting to remote directory (LDAP) servers.
-          </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>Summary Preferences</term>
-	<listitem>
-	  <para>
-             Set the mail folders, news feeds, schedule summary
-             length, and weather locations to be displayed here. For
-             news feeds, enter the web address of any RDF
-            file. Summary customization is covered in <xref
-            linkend="customizing-summary" /> rather than in this
-            chapter.
-          </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>Out of Office</term>
-	<listitem>
-	  <para>
-            This item will only appear if you have Ximian Connector
-            for Microsoft Exchange installed. It allows you to create
-            and remove automatic "vacation" messages.  For
-            information about how to use this feature, read <xref
-            linkend="exchange-out-of-office" />.
-          </para>
-	</listitem>
-      </varlistentry>
-    </variablelist>
-  </para>
-
-   <sect1 id="config-prefs-mail-identity">
-      <title>Working with Mail Accounts</title> 
-      <para>
-         <application>Ximian Evolution</application> allows you to
-         maintain multiple accounts, or identities.  This is useful
-         want to keep personal and professional email separate, or if
-         you wear several hats at work. When you are writing an email
-         message, you can which account to use by selecting from the
-         drop-down list next to the <guilabel>From</guilabel> entry in
-         the message composer.
-       </para>
-
-       <para>
-         Clicking <guibutton>Get Mail</guibutton> will refresh any
-         IMAP, <filename>mh</filename>, or
-         <filename>mbox</filename> listings
-         and check and download mail from all POP servers.  In other
-         words, <guibutton>Get Mail</guibutton> gets your mail, no
-         matter how many sources you have, or what types they are.  If
-         you don't want to check mail for a given account, select it
-         in the <guilabel>Accounts</guilabel> tab and click the
-         <guibutton>Disable</guibutton> button.
-       </para>
-       
-      <para>
-         To add a new account, simply click <guibutton>Add</guibutton>
-         to open the mail configuration assistant. To alter an
-         existing identity, select it in the
-         <interface>Preferences</interface> window, and then click
-         <guibutton>Edit</guibutton> to open the account editor
-         dialog.
-      </para>
-
-     <para>
-         The account editor dialog has six sections:
-          <variablelist>
-
-	  <varlistentry> 
-	    <term>Identity:</term>
-           <listitem>
-	    <para>
-              Here, enter the name,
-              email address, and other identifying information for the
-              account. You may also choose a default signature to
-              insert into messages sent from this account.
-            </para>
-	  </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term>Receiving Mail</term>
-           <listitem>
-	    <para>
-             Here, select the way you will be getting mail: you may
-             download mail from a server (<glossterm
-             linkend="pop">POP</glossterm>), read and keep it on the
-             server (Microsoft Exchange or <glossterm
-             linkend="imap">IMAP</glossterm>), or read it from files
-             that already exist on your desktop computer.  If you use
-             a server, it may permit or require you to use a Secure
-             Socket Layer (SSL) connection.  To turn SSL connections
-             on, just click the <guibutton>Use Secure Connection
-             (SSL)</guibutton> button.
-
-<note id="config-arbitrary-port">
-<title>Specifying Port Numbers</title>
-<para>
-Your system administrator may ask you to connect to a specific port on
-a mail server. To specify which port you use, just type a colon and
-the port number after the server name. For example, to connect to port
-143 on the server smtp.omniport.com, you would enter
-as
-<userinput>
-smtp.omniport.com:143
-</userinput> as the server name.
-</para>
-</note>
-
-	  </para>
-	  </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term>Receiving Options</term>
-           <listitem>
-	    <para>
-              Here, decide whether you'd like to check for mail
-              automatically and how often, as well as other message
-              retrieval options.
-
-              <variablelist>
-                <varlistentry>
-                   <term>If you chose POP:</term>
-                   <listitem>
-                     <para>
-                   <itemizedlist>
-			  <listitem>
-			    <para>Checking for new mail: If you would
-	                     like <application>Evolution</application>
-	                     to check for new mail automatically,
-	                     check the box and select a frequency in
-	                     minutes.
-                           </para>
-			  </listitem>
-
-			  <listitem>
-			    <para>
-                             Message Storage: If you'd like to store
-	                      copies of your mail on the server, check
-	                      this option.
-                           </para>
-			  </listitem>
-		
-			
-                           <listitem>
-			    <para>Store Store status headers in
-			    Elm/Pine/Mutt format: If you would like to
-			    use the X-Status header format used by the
-			    mail clients Elm, Pine, and Mutt, select
-			    this option. This option is useful if you
-			    plan to check your mail with those clients
-			    from time to time.
-                           </para>
-			  </listitem>
-	               </itemizedlist>
-                      </para>
-		    </listitem>
-                  </varlistentry> 
-
-                <varlistentry>
-                   <term>If you chose Microsoft Exchange:</term>
-                   <listitem>
-                     <para>
-
-	    <itemizedlist> <listitem>
-		<para>Checking for new mail: If you would like
-                Evolution to check for new mail automatically, check
-                the box and select a frequency in minutes.
-		</para>
-	      </listitem>
-
-	      <listitem>
-		<para>
-                  Global Catalog server name: enter the name of your
-                  Global Catalog server to create a folder for your
-                  organization's Global Address List.
-		</para>
-	      </listitem>
-
-	      <listitem>
-		<para>Limit number of Responses: Select a maximum number
-		of results for an address search. Lowering the maximum
-		number the load on your system and on your
-                network. Most servers will not send more than 1000
-                results, regardless of the value you select here.
-		  </para>
-	      </listitem>
-
-	      <listitem>
-		<para>Mailbox Name: Enter your mailbox name.
-		</para>
-	      </listitem>
-
-	      <listitem>
-		<para>
-                OWA Path: Enter the path used with Outlook Web Access on your server.
-		</para>
-	      </listitem>
-
-	      <listitem>
-		<para>
-                  Public Folder Server: Enter the name of your public
-                  folder server, if it differs from your Exchange server.
-		</para>
-	      </listitem>
-	      <listitem>
-		<para>
-                  Apply Filters to new messages in Inbox on this
-                  server: check this box if you wish to apply filters
-                  to this account.
-		</para>
-	      </listitem>
-	    </itemizedlist>                       
-                     </para>
-                   </listitem>
-                  </varlistentry> 
-
-                <varlistentry>
-                   <term>If you chose IMAP:</term>
-                   <listitem>
-                     <para>
-                      
-         <itemizedlist>
-	  <listitem>
-	    <para>Checking for new mail: If you would like
-	    <application>Evolution</application> to check for new mail
-	    automatically, check the box and select a frequency in
-	    minutes.  
-            </para>
-	  </listitem>
-
-	  <listitem>
-	    <para>If you want <application>Evolution</application>
-	    to check for new messages in <emphasis>all</emphasis> your
-	    IMAP folders, make sure the <guilabel>Check for new
-	    messages in all folders</guilabel> box is selected.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>Show only subscribed folders: Check this box if you
-	    have more folders in your IMAP view than you want to
-	    read.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>
-              Override server-supplied namespace: If you like, enter a
-              specific directory where your server stores mail for
-              you.  Typical values are "mail" and "Mail."  For more
-              information about how to use IMAP mail, see <xref
-              linkend="usage-mail-subscriptions"/>.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>Apply filters to new messages in INBOX on this
-	    server: If you'd like your filters to work on this
-            account, check this box.
-          </para>
-	  </listitem>
-
-	   <listitem>
-	    <para>Store Store status headers in Elm/Pine/Mutt format:
-	    If you would like to use the X-Status header format used
-	    by the mail clients Elm, Pine, and Mutt, select this
-	    option. This option is useful if you plan to check your
-	    mail with those clients from time to time.
-	   </para>
-	  </listitem>
-
-	</itemizedlist>
-                     </para>
-                   </listitem>
-                  </varlistentry> 
-
-             
-                  </variablelist>  
-     </para>
-	  </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term>Sending Mail</term>
-           <listitem>
-	    <para>
-              In this section, you will choose and configure a method
-              for sending mail.  You may choose <glossterm
-              linkend="smtp">SMTP</glossterm>, Microsoft Exchange (if
-              you have purchased the Ximian Connector for Microsoft
-              Exchange) or <glossterm
-              linkend="sendmail">sendmail</glossterm>.
-             </para>
-             <para>
-               If you choose Exchange or Sendmail, you're done with
-               this tab. SMTP offers you a choice of hostname,
-               connection security level, and authentication type,
-               which you will recognize as similar to those for
-               IMAP and POP servers in the <guilabel>Receiving
-               Mail</guilabel> tab.
-             </para>
-	  </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term>Defaults</term>
-           <listitem>
-	    <para>
-              Here, you can decide where this account will store the
-              messages that it has sent, and the messages that you
-              save as drafts. If you wish to revert to the "factory"
-              settings, click the <guibutton>Restore
-            Defaults</guibutton> button.
-            </para>
-            <para>
-              If you wish to send someone a copy of every message from
-              this account, check the box labeled <guilabel>Always
-              carbon-copy (Cc) to:</guilabel> or <guilabel>Always
-              blind carbon-copy (Bcc) to:</guilabel>, and enter one or
-              more addresses.
-            </para>
-	  </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term>Security</term>
-           <listitem>
-	    <para>
-              In this section, you will set the security options for
-              this account. If you use encryption, enter your PGP
-              key id (see <xref linkend="encryption"/> for more
-              information) and select among the four options below to
-            determine key and signature handling.
-            </para>
-	  </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect1>
-  
-    <sect1 id="config-prefs-folders">
-      <title>Folder Settings</title>
-      <para>
-        There are three sets of folder options. In the first,
-        <guilabel>Defaults</guilabel>, select which folders will be
-        your usual mail, contact, calendar, and task folders. These
-        are the folders opened when you click items in the shortcut
-        bar, and when you want to save a calendar attachment or
-        address card.
-      </para>
-      <para>
-        The <guilabel>Offline Folders</guilabel> are the ones which
-        will be cached when you activate the <guibutton>Go
-        Offline</guibutton> feature. 
-      </para>
-      <para>
-        Select one or more folders of contacts for your
-        <guilabel>Autocompletion Folders</guilabel>. When you type a
-        few letters into the message composer address fields,
-        Evolution will look for matches in the folders you choose here.
-      </para>
-    </sect1>
-
-    <sect1 id="config-prefs-mail">
-      <title>Mail Options</title>
-      <para>
-        The <guilabel>Mail Options</guilabel> tool lets you choose how
-        to display citations, how long to wait before marking a
-        message as read, and other mail display settings. There are
-        three categories of settings: General, HTML Mail, and
-        Colors.
-      </para>
-      <para>
-        For information on individual email account settings, see <xref
-        linkend="config-prefs-mail-identity" />.
-      </para>
-
-      <para>
-        In the <guilabel>General</guilabel> tab, your options are:
-     <variablelist>
-       <varlistentry>
-         <term>Message Fonts</term>
-         <listitem>
-           <para>
-             Normally, Evolution will use the same fonts as other
-             GNOME applications. To choose different fonts, uncheck
-             the box <guilabel>Use the same fonts as other
-           applications</guilabel> and select one font for standard typefaces and 
-           a second for monospace, or terminal, display.
-           </para>
-         </listitem>
-       </varlistentry>
-
-       <varlistentry>
-         <term>Message Display</term>
-         <listitem>
-           <para>
-             These three settings handle the way messages appear to
-             you. 
-             <variablelist>
-               <varlistentry>
-                 <term>Mark Messages as Read</term>
-                 <listitem>
-                   <para> 
-                   Normally, Evolution will mark a message as read as soon
-                   as it is displayed. If you prefer, you may set this to
-                   happen only after a delay, or disable it entirely and
-                   mark messages as read only when you choose to do so.
-                 </para>
-                 </listitem>
-               </varlistentry>
-           
-               <varlistentry>
-                 <term>Default Character Encoding</term>
-                 <listitem>
-                   <para>
-                     This setting allows you to select character
-                     interpretation sets so that Evolution can display
-                     different alphabets.  If you are not sure, pick
-                     Unicode (UTF-8), which will work for a large
-                     number of languages and character sets.
-                   </para>
-                 </listitem>
-               </varlistentry>
-           
-               <varlistentry>
-                 <term>Quotation Highlight Color</term>
-                 <listitem>
-                   <para>
-                     Choose a color to highlight quotations from other
-                     messages.
-                   </para>
-                 </listitem>
-               </varlistentry>
-             </variablelist>
-           </para>
-         </listitem>
-       </varlistentry>
-       
-       <varlistentry>
-         <term>Deleting Mail</term>
-         <listitem>
-           <para>
-             Here, choose whether to delete messages automatically
-             when quitting Evolution, and whether you wish to
-             explicitly confirm the final deletion of messages.
-           </para>
-         </listitem>
-       </varlistentry>
-           
-       <varlistentry>
-         <term>New Mail Notification</term>
-         <listitem>
-           <para>
-              Evolution can alert you to the arrival of new mail with
-             a beep or by playing a sound file. Choose your alert
-             noise, or select none, as you wish.
-           </para>
-         </listitem>
-       </varlistentry>
-     </variablelist>
-   </para>
-   <para>
-     The options in the <guilabel>HTML Mail</guilabel> section are:
-   <variablelist>
-    
-       <varlistentry>
-         <term>Loading Images</term>
-         <listitem>
-           <para>
-             You can embed a message in an email and have it load only
-             when the message arrives. However, spammers can use image loading
-             patterns to confirm "live" addresses and invade your
-             privacy. You may elect never to load images
-             automatically, to load images only if the sender is in
-             your addressbook, or always load images.
-           </para>
-           <para>
-             If you have chosen not to load images automatically, you
-             can choose to see the images in one message at a time by selecting <menuchoice>
-             <guimenu>View</guimenu><guisubmenu>Message Display</guisubmenu>
-             <guimenuitem>Load Images</guimenuitem></menuchoice>.
-           </para>
-         </listitem>
-       </varlistentry>
-
-       <varlistentry>
-         <term>Show animated images</term>
-         <listitem>
-           <para>
-             Turn animation on or off here.
-           </para>
-         </listitem>
-       </varlistentry>
-
-       <varlistentry>
-         <term>Automatically detect links</term>
-         <listitem>
-           <para>
-             Check this box to have Evolution look for web addresses in your mail
-             and make them clickable automatically.
-           </para>
-         </listitem>
-       </varlistentry>
-
-       <varlistentry>
-         <term>Prompt when sending HTML messages to contacts that don't want them</term>
-         <listitem>
-           <para>
-             Some people do not like HTML mail, and you can set
-             Evolution to warn you. This warning will appear only
-             when you send HTML mail to people in your address book
-             who are listed as disliking HTML.
-           </para>
-         </listitem>
-       </varlistentry>
-     </variablelist>
-   </para>
-   <para>
-     The <guilabel>Colors</guilabel> tab lets you select different
-   color labels for individual messages. You can return to the default
-   settings by clicking the <guibutton>Restore Defaults</guibutton>
-   button.
- </para>
-</sect1>
-
-
-    <sect1 id="config-prefs-mail-composer">
-      <title>Message Composer Preferences</title>
-      <para>
-        There are three  tabs of settings you can change for the
-        message composer. The General tab covers shortcuts and
-        assorted behavior, and the other two control signatures and
-        spell checking.  In the General tab, you can set:
-
-         <variablelist>
-
-	  <varlistentry>
-	    <term>Shortcuts Type</term>
-	    <listitem>
-	      <para>
-                 Choose a keyboard shortcut scheme: do you prefer
-                 keyboard shortcuts similar to those of Microsoft
-                 Windows, XEmacs, or Emacs?
-               </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Default Behavior</term>
-	    <listitem>
-	      <para>
-                 Choose how you will normally forward and reply
-                 messages, what character set they will use, whether
-                 they will be in HTML, and whether that HTML can
-                 contain smiley face images.
-               </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term>Alerts</term>
-	    <listitem>
-	      <para>
-                 There are two optional alerts here:
-                 <variablelist>
-	         <varlistentry>
-		    <term>Prompt when sending messages with an empty subject</term>
-		    <listitem>
-		      <para>
-			 The composer will warn you if you try to send a
-			 message without a subject.
-		       </para>
-		    </listitem>
-		  </varlistentry>
-
-		  <varlistentry>
-		    <term>Prompt when sending messages with only Bcc recipients defined</term>
-		    <listitem>
-		      <para>
-			 The composer will warn you if you try to send a
-			 message that has only <guilabel>Bcc</guilabel>
-			 recipients. This is important because some mail
-			 servers will fail to honor blind carbon copy if you
-			 do not have at least one recipient that is visible to
-			 all readers.
-		       </para>
-		    </listitem>
-		  </varlistentry>
-	      </variablelist>
-               </para>
-	    </listitem>
-	  </varlistentry>
-      </variablelist>
-    </para>
-
-     <para>
-         The signature editor allows you to create several different
-         signatures in plain text or in HTML, and to specify which of
-         them will be added to emails you create in the message
-         composer.  If you prefer to use an alternate signature or
-         none at all, you can select it from the mail composer itself.
-    </para>
-    <para>
-       In the spell-checking tool, you can set spelling options,
-       including the language or languages you will use. Note that you
-       must install the gnome-spell package, available through Red
-       Carpet, for spell-checking to be available in
-       Evolution. Alternate dictionaries are also available through
-       Red Carpet and are detected automatically if you have installed
-       them.
-    </para>
-    <para>
-      You can check the spelling of messages by selecting
-      <menuchoice><guimenu>Edit</guimenu><guimenuitem>Spell Check
-      Document</guimenuitem></menuchoice>.
-      Alternately, check the <guibutton>Check spelling while i
-      type</guibutton> box, and choose a color for your misspelled words.
-  </para>
-</sect1>
-
-<!-- NOT FOR 1.0, see usage-mail.sgml
-      <sect1 id="config-prefs-news">          
-          <title>News Servers</title>
-          <para>
-            Newsgroups are so much like mailing lists that there's no
-            reason not to keep them right next to your mail.  When you
-            first select the <guilabel>News Servers</guilabel> tab,
-            you will see a blank box with the three familiar buttons
-            on the right: <guibutton>Add</guibutton>,
-            <guibutton>Edit</guibutton>, and
-            <guibutton>Delete</guibutton>.
-          </para>
-          <para>
-            Click <guibutton>Add</guibutton> to add a news server; you
-            will be prompted for its name.  Enter the name, click
-            <guibutton>OK</guibutton>, and you're done.  You can have
-            as many news servers as you like, of course.  News servers
-            will appear next to your IMAP servers in the
-            <interface>folder bar</interface>.
-          </para>
-     </sect2>
-  </sect1>
--->
-
-
-    <sect1 id="config-prefs-cal">
-       <title>Calendar and Task List Settings</title>
-       <para>
-          The calendar configuration tool has two tabs
-          <guilabel>General</guilabel> and
-          <guilabel>Display</guilabel>, and is illustrated in <xref
-          linkend="config-prefs-cal-fig"/>.
-
-      <!-- ==============Figure===================== -->
-      <figure id="config-prefs-cal-fig">
-	<title>Calendar Preferences Dialog</title>
-	<screenshot>
-	  <screeninfo>Calendar Configuration</screeninfo>
-	  <mediaobject><imageobject><imagedata fileref="figures/config-cal" format="PNG" srccredit="Aaron Weber"/>
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-      <!-- ==============End of Figure================-->
-        </para>
-
-      <para>
-        The <guilabel>General</guilabel> tab lets you set the
-        following:
-        <variablelist>
-	  <varlistentry>
-	    <term>Time zone</term>
-	    <listitem>
-	      <para>
-		The city you're located in, to judge your time zone.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Time format</term>
-	    <listitem>
-	      <para>You may choose between twelve-hour (AM/PM) and
-	      twenty-four hour time formats here by clicking the
-	      appropriate radio button.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Work Week</term>
-	    <listitem>
-	      <para>
-                When does your work day start, and when does it end?
-		In the day and week views,
-		<application>Evolution</application> displays all the
-		hours in the range you select here, even if there are
-		no appointments for those times.  Of course, you can
-		still schedule an appointment outside of these hours,
-		and if you do, the display will be extended to show
-		it.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Week Starts</term>
-	    <listitem>
-	      <para>You can set weeks to start on Sunday or on Monday.</para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Day Begins</term>
-	    <listitem>
-	      <para>
-		Set the beginning of a normal workday. If you work odd
-		hours, or want to make sure that your early-morning
-		appointments are displayed, you may find this option useful.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Day Ends</term>
-	    <listitem>
-	      <para>
-		Set the end of a normal workday. If you work odd
-		hours, or want to make sure that your evening
-		appointments are displayed, you may find this option
-		useful.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term>Alerts</term>
-	    <listitem>
-	      <para>
-		If you'd like to be warned before you delete any
-		appointment, or to have a reminder automatically
-		appear for each event, select the check boxes here.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-
-      <para>
-	The <interface>Display</interface> section lets you choose how
-	your appointments and tasks will appear in your calendar.
-      </para>
-      <para>The display properties you can set are:
-
-	<variablelist>
-	  <varlistentry>
-	    <term>Time divisions</term>
-	    <listitem>
-              <para>
-		Sets the increments shown on the daily view in the
-		calendar.  You can set this to be anywhere from five
-		minutes to an hour, in five minute increments.</para>
-            </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Show appointment end times in week and month views</term>
-	    <listitem>
-	      <para>
-		If there is space,
-		<application>Evolution</application> will show the end
-		times in the week and month views for each
-		appointment.
-              </para>
-            </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Compress weekends in month view</term>
-	    <listitem>
-	      <para>
-		If checked, your weekends will be shown in one box,
-		instead of one for each day in the month view.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Show week numbers in date navigator</term>
-	    <listitem>
-              <para>
-		This will show the week numbers next to the respective
-		weeks in the calendar.
-	      </para>
-            </listitem>
-	  </varlistentry>
-
-	 <varlistentry>
-	   <term>Tasks due today</term>
-	    <listitem>
-	      <para>
-		Configures what color to set your tasks that are due
-		today to.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Overdue tasks</term>
-	    <listitem>
-	      <para>
-		Choose the color for overdue tasks.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-  </sect1>
-  <sect1 id="config-prefs-contact">
-    <title>Directory Server Settings</title>
-    <para>
-        Addressbook settings are limited to the usage and
-        configuration of directory servers (LDAP and
-      Exchange). To learn how to set autocompletion options, see <xref
-      linkend="config-prefs-folders" />.
-      Other addressbook controls are available in the addressbook
-      window itself.
-    </para>
-      
-      <para>
-	To add a new <glossterm linkend="ldap">LDAP</glossterm> server
-	to your available contact folders:
-    </para>
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select 
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Settings</guimenuitem>
-	      </menuchoice>
-	      and click the <guibutton>Directory Servers</guibutton>
-	      shortcut button.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Add</guibutton> button on the right
-	      side to open a Directory Server addition assistant.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Enter the server information as requested by the assistant:
-	    <variablelist>
-		<varlistentry>
-		  <term>Server name</term>
-		  <listitem>
-		    <para>
-		      Address of the server where the addressbook is located.
-		    </para>
-		  </listitem>
-		</varlistentry>
-		<varlistentry>
-		  <term>Login Method</term>
-		  <listitem>
-		    <para>
-		      Specify whether your login is anonymous, using
-                      an email address, or a "distinguished name." If
-                      the login is not anonymous, enter the login name
-                      required by the server.
-		    </para>
-		  </listitem>
-		</varlistentry>
-		<varlistentry>
-		  <term>Port</term>
-		  <listitem>
-		    <para>
-		      The internet port
-		      <application>Evolution</application> connects to
-		      in order to access the LDAP database.  This is
-		      normally 389.
-		    </para>
-		  </listitem>
-		</varlistentry>
-                <varlistentry>
-                  <term>Use SSL/TLS</term>
-		  <listitem>
-		    <para>
-                      SSL and TLS are security mechanisms. If you
-                      select <guilabel>Always</guilabel>, Evolution
-                    will not connect unless
-                    secure connections are available. The default value is
-                    <guilabel>Whenever Possible</guilabel>, which uses
-                    secure connections if they are available,
-                    but does not cause failure if they are not.
-		    </para>
-		  </listitem>
-		</varlistentry>
-
-
-		<varlistentry>
-		  <term><glossterm linkend="search-base">Search base</glossterm></term>
-		  <listitem>
-		    <para>
-		      The base entry to use for all your searches.
-		      Contact your administrator for information about
-		      the correct settings.
-		    </para>
-		  </listitem>
-		</varlistentry>
-		<varlistentry>
-		  <term><glossterm linkend="search-scope">Search scope</glossterm></term>
-		  <listitem>
-		    <para>
-		      How broad the search is in the directory.  The
-		      following options are available:
-		      <variablelist>
-			<varlistentry>
-			  <term>One</term>
-			  <listitem>
-			    <para>
-			      Searches the Search Base and one entry
-			      below it.
-			    </para>
-			  </listitem>
-			</varlistentry>
-			<varlistentry>
-			  <term>Sub</term>
-			  <listitem>
-			    <para>
-			      Searches the Search Base and all entries
-			      below it.
-			    </para>
-			  </listitem>
-			</varlistentry>
-                      </variablelist>
-                    </para>
-                  </listitem>
-                </varlistentry>
-
-                <varlistentry>
-                  <term>Timeout Limit</term>
-		  <listitem>
-		    <para>
-                      This is the maximum time Evolution will attempt to
-                      download data from the server before giving up.
-		    </para>
-		  </listitem>
-		</varlistentry>
-
-
-                <varlistentry>
-                  <term>Download Limit</term>
-		  <listitem>
-		    <para>
-		      Set the maximum number of results for a given
-                      search. Most servers refuse to send more than
-                      500, but you can set the number lower if you
-                      want to shorten downloads for very broad
-                      searches.
-		    </para>
-		  </listitem>
-		</varlistentry>
-
-
-                <varlistentry>
-                  <term>Display name</term>
-		  <listitem>
-		    <para>
-		      The name that you see on the screen.  This could
-		      be anything you wish.
-		    </para>
-		  </listitem>
-		</varlistentry>
-
-	      </variablelist>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>OK</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>OK</guibutton> to permanently make
-	      changes or <guibutton>Apply</guibutton> to temporarily
-	      set the changes.
-	    </para>
-	  </listitem>
-	</orderedlist>
-        <para>
-          Editing a directory server account means changing that same
-          information, although it is displayed in a slightly different order.
-        </para>
-    </sect1>
-
-
-</chapter>
\ No newline at end of file
diff --git a/help/C/config-sync.xml b/help/C/config-sync.xml
deleted file mode 100644
index 6a6503a670..0000000000
--- a/help/C/config-sync.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-  <chapter id="config-sync">
-     <title>Setting up your synchronization system</title> 
-     <para>
-        Synchronization presents you with two issues you'll need to
-        address. 
-        <simplelist>
-          <member>
-            Your computer needs to recognize and access your handheld.
-            At this time, <application>Ximian Evolution</application> only
-            supports Palm-OS devices like the Palm Pilot and the
-            Handspring Visor.
-          </member>
-          <member>
-           You should decide what sort of synchronization behavior you
-           want.
-          </member>
-        </simplelist>
-    </para>
-
-    <para>
-       If you haven't used a handheld device with your computer
-       before, you'll need to run the GNOME <application>Control
-       Center</application> by selecting
-       <menuchoice><guimenu>System</guimenu><guimenuitem>Settings</guimenuitem></menuchoice>,
-       and make sure that <application>Pilot Link</application> is
-       properly configured. You will need to make sure that you have
-       read and write permissions on the device, which is normally
-       /dev/pilot. If that does not work, check /dev/ttyS0 if you have
-       a serial connection, or /dev/ttyUSB0 for a USB connection. You
-       can do this by becoming root and running the command:
-       <userinput>chmod 777 /dev/ttyUSB0</userinput>.
-    </para>
-    <para>
-        Once your computer and your Palm-OS device are talking happily
-        to each other, select the <glossterm
-        linkend="conduit">conduits</glossterm> you want under the
-        <guilabel>Pilot Conduits</guilabel> section of the Control
-        Center.  You may use conduits to synchronize data with several
-        applications; the <application>Ximian Evolution</application>
-        conduits are labeled <guilabel>EAddress</guilabel>, for the
-        contacts in your addressbook, <guilabel>ECalendar</guilabel>,
-        for your calendar, and <guilabel>ETodo</guilabel>, for your
-        task list.
-    </para>
-   <para>
-      To enable a conduit, click the
-        <guibutton>Enable</guibutton> to enable it, and click
-        <guibutton>Settings</guibutton> to change what it will do when
-        activated.  Your options may vary depending on the conduit,
-        but typically they will be:
-
-        <variablelist>
-         <varlistentry>
-            <term>Disabled:</term>
-            <listitem> 
-               <para>
-                  Do nothing.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Synchronize:</term>
-            <listitem> 
-               <para>
-                  Copy new data from the computer to the handheld, and
-                  from the handheld to the computer.  Remove items
-                  that were on both systems but have been deleted on
-                  one.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Copy From Pilot:</term>
-            <listitem> 
-               <para>
-                  If there is any new data on the the handheld device,
-                  copy it to the computer.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Copy To Pilot:</term>
-            <listitem> 
-               <para>
-                 Copy new data from the computer to the handheld. 
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Merge From Pilot:</term>
-            <listitem> 
-               <para>
-                  Copy new data from the handheld to the computer, and
-                  remove any information from the computer that has
-                  been deleted on the handheld.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Merge To Pilot:</term>
-            <listitem> 
-               <para>
-                  Copy new data from the computer to the handheld, and
-                  remove any information from the handheld that has
-                  been deleted on the computer.
-               </para>
-            </listitem>
-          </varlistentry>
-       </variablelist>
-    </para>
-
-    <para>
-      Select the behavior you want for each conduit you choose to use.
-      If you're not sure, go ahead and stick with
-      <guilabel>Synchronize</guilabel>.  Then, put your handheld on
-      its cradle and press the HotSync button.
-    </para>
-      <para> 
-         <tip> 
-	  <title>Data Loss Prevention</title> 
-	  <para>
-	    It's always a good idea to make a backup.  To do that,
-	    make a copy of the <filename>evolution</filename>
-	    directory inside your home directory.
-          </para>
-	</tip>
-       </para>
-
-    </chapter>
-
-
-
-
diff --git a/help/C/evolution-1.4-C.omf b/help/C/evolution-1.4-C.omf
deleted file mode 100644
index 7637831592..0000000000
--- a/help/C/evolution-1.4-C.omf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<omf>
-  <resource>
-    <creator>
-      Ximian, Inc.
-    </creator>
-    <title>
-      User's Guide to Ximian Evolution 1.4
-    </title>
-    <date>2002-2003</date>
-    <subject category="GNOME|Applications"/>
-    <description>
-	A user's guide to Ximian Evolution which explains how to use
-	its mail, calendar, addressbook, and task list features.
-    </description>
-    <type>
-	manual
-    </type>
-    <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
-    <identifier url="/"/>
-    <language code="C"/>
-    <relation seriesid="83434cc6-71d1-11d7-9b12-ef76b8cf7c8f" />
-    <rights type="GNU FDL" license.version="1.1" license="http://www.gnu.org/licenses/fdl.html" holder="Ximian, Inc."/>
-  </resource>
-</omf>
diff --git a/help/C/evolution-1.4.xml b/help/C/evolution-1.4.xml
deleted file mode 100644
index 654a177da1..0000000000
--- a/help/C/evolution-1.4.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version='1.0' ?>
-
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
- "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-
-<!ENTITY GFDL SYSTEM "apx-fdl.xml">
-<!ENTITY LEGAL SYSTEM "legal.xml">
-<!ENTITY GPL SYSTEM "apx-gpl.xml">
-<!ENTITY PREFACE SYSTEM "preface.xml">
-<!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.xml">
-<!ENTITY USAGE-EXEC-SUMMARY SYSTEM "usage-exec-summary.xml">
-<!ENTITY USAGE-MAIL SYSTEM "usage-mail.xml">
-<!ENTITY USAGE-MAIL-ORG SYSTEM "usage-mail-org.xml">
-<!ENTITY USAGE-CONTACT SYSTEM "usage-contact.xml">
-<!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.xml">
-<!ENTITY USAGE-EXCHANGE SYSTEM "usage-exchange.xml">
-<!ENTITY USAGE-SYNC SYSTEM "usage-sync.xml">
-<!ENTITY USAGE-PRINT SYSTEM "usage-print.xml">
-<!ENTITY CONFIG-PREFS SYSTEM "config-prefs.xml">
-<!ENTITY CONFIG-SYNC SYSTEM "config-sync.xml">
-<!ENTITY MENUREF SYSTEM "menuref.xml">
-<!ENTITY APX-GLOSS SYSTEM "apx-gloss.xml">
-<!ENTITY APX-COMMON-TASKS SYSTEM "apx-common-tasks.xml">
-<!ENTITY APX-BUGS SYSTEM "apx-bugs.xml">
-<!ENTITY APX-AUTHORS SYSTEM "apx-authors.xml">
-
-<!ENTITY appversion "1.4">
-<!ENTITY docversion "1.4">
-<!ENTITY pubdate "May, 2003">
-
-]>
-
-<!-- Almost every chapter is an entity.  Files, Chapter id's, and
-entity names correspond.  APX is for appendix.  -->
-
-<book id="index">
-  <bookinfo>
-    <title>A User's Guide to Ximian Evolution 1.4</title>
-    <authorgroup>
-      <author><firstname>Aaron</firstname><surname>Weber</surname></author>
-      <author><firstname>Kevin</firstname><surname>Breit</surname></author>
-      <author><firstname>Ettore</firstname><surname>Perazzoli</surname></author>
-      <author><firstname>Duncan</firstname><surname>Mak</surname></author>
-    </authorgroup>
-    <copyright>
-      <year>2000-2003</year>
-      <holder>Ximian, Inc.</holder>
-    </copyright>
-    
-   <releaseinfo>
-      This is version &docversion; of the Ximian Evolution manual. It describes
-      version &appversion; of the Ximian Evolution groupware suite.
-   </releaseinfo>
-
-
-    <legalnotice id="legalnotice">
-      <para>
-         Please note that legal and licensing information is in <xref
-         linkend="preface" /> due to formatting issues with its
-         previous location.
-       </para>
-    </legalnotice>
-  </bookinfo>
-
-
-  <preface id="preface">
-    <title>Preface</title> 
-  &LEGAL;
-  &PREFACE;
-  </preface>
-
-  <part id="usage">
-    <title>Getting Started with Ximian Evolution</title>
-     <partintro>
-      <para>
-        Part one of the <application>Ximian Evolution</application> manual
-        describes how to use <application>Ximian Evolution</application> for
-        email, contact management, and appointment and task
-        scheduling.  You'll find as you go along that there's more
-        than one way to do things, and you can pick whichever method
-        you like best.
-      </para>
-    </partintro>
-
-    &USAGE-MAINWINDOW;
-    &USAGE-EXEC-SUMMARY;
-    &USAGE-MAIL;
-    &USAGE-MAIL-ORG;
-    &USAGE-CONTACT;
-    &USAGE-CALENDAR;
-    &USAGE-EXCHANGE;
-    &USAGE-SYNC; 
-    &USAGE-PRINT;
-  </part>
-  <part id="config">
-  <title>Configuring and Managing Ximian Evolution</title>
-    <partintro>
-      <para>
-        <application>Ximian Evolution</application> is highly
-        configurable.  Usually, when developers say that, they mean
-        that they didn't test it out thoroughly and have left it to
-        other programmers to "configure" themselves a working
-        system. In the case of <application>Ximian
-        Evolution</application>, "configurable" means that, while you
-        can expect the program to work perfectly well with the default
-        settings, it's also easy to alter its behavior in a wide
-        variety of ways, so that it fits your needs exactly.  This
-        part of the book will describe that process, from the quickest
-        glimpse of the Setup Assistant to an in-depth guide to obscure
-        preferences settings.
-      </para>
-    </partintro>
-
-    &CONFIG-PREFS;
-    &CONFIG-SYNC;
-  </part>
-
-  &MENUREF;
-  &APX-GLOSS;
-  &APX-BUGS;
-  &APX-AUTHORS; 
-  &GPL;
-  &GFDL;
-
-</book>
\ No newline at end of file
diff --git a/help/C/figures/calendar.png b/help/C/figures/calendar.png
deleted file mode 100644
index c89b97c702..0000000000
--- a/help/C/figures/calendar.png
+++ /dev/null
diff --git a/help/C/figures/config-cal.png b/help/C/figures/config-cal.png
deleted file mode 100644
index 41fd408292..0000000000
--- a/help/C/figures/config-cal.png
+++ /dev/null
diff --git a/help/C/figures/config-mail.png b/help/C/figures/config-mail.png
deleted file mode 100644
index 6e3f2a1e87..0000000000
--- a/help/C/figures/config-mail.png
+++ /dev/null
diff --git a/help/C/figures/contact-editor.png b/help/C/figures/contact-editor.png
deleted file mode 100644
index 21a0bb61ad..0000000000
--- a/help/C/figures/contact-editor.png
+++ /dev/null
diff --git a/help/C/figures/contact.png b/help/C/figures/contact.png
deleted file mode 100644
index c5138ce609..0000000000
--- a/help/C/figures/contact.png
+++ /dev/null
diff --git a/help/C/figures/exchange-identity.png b/help/C/figures/exchange-identity.png
deleted file mode 100644
index 85f6cf30da..0000000000
--- a/help/C/figures/exchange-identity.png
+++ /dev/null
diff --git a/help/C/figures/exchange-receive-options.png b/help/C/figures/exchange-receive-options.png
deleted file mode 100644
index 28ef787125..0000000000
--- a/help/C/figures/exchange-receive-options.png
+++ /dev/null
diff --git a/help/C/figures/exchange-receive.png b/help/C/figures/exchange-receive.png
deleted file mode 100644
index adfb82dfd1..0000000000
--- a/help/C/figures/exchange-receive.png
+++ /dev/null
diff --git a/help/C/figures/filter-assist-fig.png b/help/C/figures/filter-assist-fig.png
deleted file mode 100644
index 672351b36e..0000000000
--- a/help/C/figures/filter-assist-fig.png
+++ /dev/null
diff --git a/help/C/figures/filter-new-fig.png b/help/C/figures/filter-new-fig.png
deleted file mode 100644
index 51fc680df9..0000000000
--- a/help/C/figures/filter-new-fig.png
+++ /dev/null
diff --git a/help/C/figures/full-1.png b/help/C/figures/full-1.png
deleted file mode 100644
index 84afc9d3e7..0000000000
--- a/help/C/figures/full-1.png
+++ /dev/null
diff --git a/help/C/figures/full-2.png b/help/C/figures/full-2.png
deleted file mode 100644
index 929e356db5..0000000000
--- a/help/C/figures/full-2.png
+++ /dev/null
diff --git a/help/C/figures/full-3.png b/help/C/figures/full-3.png
deleted file mode 100644
index 175fd1d970..0000000000
--- a/help/C/figures/full-3.png
+++ /dev/null
diff --git a/help/C/figures/full-4.png b/help/C/figures/full-4.png
deleted file mode 100644
index 45d66bb193..0000000000
--- a/help/C/figures/full-4.png
+++ /dev/null
diff --git a/help/C/figures/full-5.png b/help/C/figures/full-5.png
deleted file mode 100644
index 5fcfd20e45..0000000000
--- a/help/C/figures/full-5.png
+++ /dev/null
diff --git a/help/C/figures/full-6.png b/help/C/figures/full-6.png
deleted file mode 100644
index 484eca4903..0000000000
--- a/help/C/figures/full-6.png
+++ /dev/null
diff --git a/help/C/figures/full-7.png b/help/C/figures/full-7.png
deleted file mode 100644
index 8a19eaab42..0000000000
--- a/help/C/figures/full-7.png
+++ /dev/null
diff --git a/help/C/figures/mail-composer.png b/help/C/figures/mail-composer.png
deleted file mode 100644
index 83595e7249..0000000000
--- a/help/C/figures/mail-composer.png
+++ /dev/null
diff --git a/help/C/figures/mail-druid-pic.png b/help/C/figures/mail-druid-pic.png
deleted file mode 100644
index 18e29aa49d..0000000000
--- a/help/C/figures/mail-druid-pic.png
+++ /dev/null
diff --git a/help/C/figures/mail-inbox.png b/help/C/figures/mail-inbox.png
deleted file mode 100644
index 82a4347da2..0000000000
--- a/help/C/figures/mail-inbox.png
+++ /dev/null
diff --git a/help/C/figures/mail-threaded.png b/help/C/figures/mail-threaded.png
deleted file mode 100644
index 1b1da138f9..0000000000
--- a/help/C/figures/mail-threaded.png
+++ /dev/null
diff --git a/help/C/figures/mainwindow-pic.png b/help/C/figures/mainwindow-pic.png
deleted file mode 100644
index 15f6d6d300..0000000000
--- a/help/C/figures/mainwindow-pic.png
+++ /dev/null
diff --git a/help/C/figures/newmsg.png b/help/C/figures/newmsg.png
deleted file mode 100644
index fc960d9155..0000000000
--- a/help/C/figures/newmsg.png
+++ /dev/null
diff --git a/help/C/figures/outline.png b/help/C/figures/outline.png
deleted file mode 100644
index ef94f814a1..0000000000
--- a/help/C/figures/outline.png
+++ /dev/null
diff --git a/help/C/figures/print-dest.png b/help/C/figures/print-dest.png
deleted file mode 100644
index fb1faf7d70..0000000000
--- a/help/C/figures/print-dest.png
+++ /dev/null
diff --git a/help/C/figures/print-preview.png b/help/C/figures/print-preview.png
deleted file mode 100644
index 7f044afa3c..0000000000
--- a/help/C/figures/print-preview.png
+++ /dev/null
diff --git a/help/C/figures/replymsg.png b/help/C/figures/replymsg.png
deleted file mode 100644
index fc3ec6b599..0000000000
--- a/help/C/figures/replymsg.png
+++ /dev/null
diff --git a/help/C/figures/schedule.png b/help/C/figures/schedule.png
deleted file mode 100644
index c90db58e95..0000000000
--- a/help/C/figures/schedule.png
+++ /dev/null
diff --git a/help/C/figures/small_desktop.png b/help/C/figures/small_desktop.png
deleted file mode 100644
index 029a9629d4..0000000000
--- a/help/C/figures/small_desktop.png
+++ /dev/null
diff --git a/help/C/figures/summary.png b/help/C/figures/summary.png
deleted file mode 100644
index 148321feea..0000000000
--- a/help/C/figures/summary.png
+++ /dev/null
diff --git a/help/C/figures/vfolder-createrule-fig.png b/help/C/figures/vfolder-createrule-fig.png
deleted file mode 100644
index 733ed1f7cf..0000000000
--- a/help/C/figures/vfolder-createrule-fig.png
+++ /dev/null
diff --git a/help/C/legal.xml b/help/C/legal.xml
deleted file mode 100644
index e3591f6fb5..0000000000
--- a/help/C/legal.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-
-  <sect1 id="legal-info-note">
-   <title>Legal Information and Licensing</title>
-
-<!-- normally this content belongs in the actual "legalnotice" tag,
-     but for formatting reasons putting it in a sect1, inside the
-     Preface, and adding a paragraph to the beginning of it -->
-
-    <note id="evo-is-free-software">
-      <title>Ximian Evolution is Free Software</title>
-      <para>
-        Ximian Evolution is licensed under the terms of the GNU General
-        Public License (GPL), and its documentation is licensed
-        separately
-        under the GNU Free Documentation License (GFDL).  You can find a the
-        complete text of the GPL in <xref linkend="apx-gpl" />, and of the
-        GFDL in <xref linkend="apx-fdl"/>. The licenses are also available
-        in the files COPYING and COPYING-DOCS distributed with this
-        software. The Ximian Connector for Microsoft Exchange 2000 is
-        proprietary software and is subject to a different license. Copyright
-        for all three pieces of software and their documentation belongs to
-        Ximian, Inc.
-      </para>
-    </note>
-    <para>
-
-	  Permission is granted to copy, distribute and/or modify this
-	  document under the terms of the GNU Free Documentation
-	  License (GFDL), Version 1.1 or any later version published
-	  by the Free Software Foundation with no Invariant Sections,
-	  no Front-Cover Texts, and no Back-Cover Texts.  You can find
-	  a copy of the GFDL in <xref linkend="apx-fdl"/> or in the
-	  file COPYING-DOCS distributed with this manual.
-         </para>
-         <para> This manual is part of a collection of GNOME manuals
-          distributed under the GFDL.  If you want to distribute this
-          manual separately from the collection, you can do so by
-          adding a copy of the license to the manual, as described in
-          section 6 of the license.
-	</para>
-
-	<para>
-          Ximian is a registered trademark and Ximian Evolution, the
-	  dancing monkey logo and the Ximian capsule logo are
-	  trademarks of Ximian, Inc. Other names may be trademarks or
-	  registered trademarks of other companies or
-	  organizations. Where those names appear in any GNOME
-	  documentation, and the members of the GNOME Documentation
-	  Project are made aware of those trademarks, then the names
-	  are in capital letters or initial capital letters.
-	</para>
-
-	<para>
-	  DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED
-	  UNDER  THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE
-	  WITH THE FURTHER UNDERSTANDING THAT:
-        </para>
-	  <orderedlist>
-		<listitem>
-		  <para>DOCUMENT IS PROVIDED ON AN "AS IS" BASIS,
-                    WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR
-                    IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES
-                    THAT THE DOCUMENT OR MODIFIED VERSION OF THE
-                    DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR
-                    A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE
-                    RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE
-                    OF THE DOCUMENT OR MODIFIED VERSION OF THE
-                    DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR
-                    MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT,
-                    YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY
-                    CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY
-                    SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-                    OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
-                    LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED
-                    VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER
-                    EXCEPT UNDER THIS DISCLAIMER; AND
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL
-                       THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE),
-                       CONTRACT, OR OTHERWISE, SHALL THE AUTHOR,
-                       INITIAL WRITER, ANY CONTRIBUTOR, OR ANY
-                       DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION
-                       OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH
-                       PARTIES, BE LIABLE TO ANY PERSON FOR ANY
-                       DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR
-                       CONSEQUENTIAL DAMAGES OF ANY CHARACTER
-                       INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS
-                       OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
-                       MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR
-                       LOSSES ARISING OUT OF OR RELATING TO USE OF THE
-                       DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT,
-                       EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
-                       THE POSSIBILITY OF SUCH DAMAGES.
-		  </para>
-		</listitem>
-	  </orderedlist>
-        </sect1>
\ No newline at end of file
diff --git a/help/C/menuref.xml b/help/C/menuref.xml
deleted file mode 100644
index a88dc9962a..0000000000
--- a/help/C/menuref.xml
+++ /dev/null
@@ -1,421 +0,0 @@
-<!--
-<!DOCTYPE Appendix PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<appendix id="menuref">
-  <title>Quick Reference</title>
-  <para>
-      You might want to copy this section and tape it to the wall
-      next to your computer: it's a very short summary of most of
-      the things you'll want to do with
-      <application>Ximian Evolution</application>.
-   </para>
-
-
-<note id="shortcuts">
-<title>Custom Keyboard Shortcuts</title>
-<para>
-  If you have set custom keyboard shortcuts for your desktop, (you can
-   do this the control center: select
-   <menuchoice><guimenu>System</guimenu><guimenuitem>Settings</guimenuitem></menuchoice>
-   from your menu panel), they may interfere with Evolution keyboard
-   shortcuts.
-</para>
-<para>
-   For example, if you have chosen Emacs-style key bindings for your
-   desktop-wide text editor, the shortcut
-   <keycombo action="simul">
-    <keycap>Ctrl</keycap>
-    <keycap>W</keycap>
-  </keycombo>
-  will act as "Cut region" rather than as "Close Window" in the
-  message composer.
-</para>
-</note>
-
-
-
-
-  <sect1 id="quickref-open">
-      <title>Opening or Creating Anything</title>
-      <para>
-          <variablelist>
-
-
-	  <varlistentry>
-	    <term>New Item:</term>
-	    <listitem>
-	      <para>
-                Press <keycombo action="simul"> <keycap>Ctrl</keycap>
-		  <keycap>N</keycap> </keycombo> to open a new item
-		  for whatever part of <application>Ximian
-		  Evolution</application> you're working on. In mail,
-		  that means you'll create a new message. If you're
-		  looking at your addressbook, <keycombo
-		  action="simul"> <keycap>Ctrl</keycap>
-		  <keycap>N</keycap> </keycombo> creates a new contact
-		  card, and in the calendar, a new appointment.
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term>Create a new folder:</term>
-	    <listitem>
-	      <para>
-                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu>
-                <guimenuitem>Folder</guimenuitem></menuchoice> or
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>E</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Shortcut in the Evolution Bar:</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Shortcut</guimenuitem> </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>S</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new email message:</term>
-	    <listitem>
-	      <para>
-                Use
-                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Mail
-                Message</guimenuitem>  </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>M</keycap>
-                </keycombo>
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Appointment:</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Appointment</guimenuitem> </menuchoice>  or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>A</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term>Enter a new Contact:</term>
-	    <listitem>
-	      <para>       
-                  Double-click in any blank space in the contact
-                  manager to create a new address card.  You can also
-                  use 
-                 <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Contact</guimenuitem> </menuchoice>  or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>C</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Task:</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Task</guimenuitem>  </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>T</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect1> 
-    <sect1 id="quickref-mail">
-      <title>Mail Tasks</title>
-      <para>
-        Here are the most frequent email tasks, and shortcuts for
-        navigating your mailbox with the keyboard instead of the
-        mouse:
-         <variablelist>
-
-  
-        <varlistentry>
-	    <term>Send and Receive Mail:</term>
-	    <listitem>
-	      <para>
-                Press <keycap>F9</keycap>, click the
-                <guibutton>Send/Receive</guibutton> button in the
-                toolbar, or choose
-                <menuchoice><guimenu>Actions</guimenu> 
-                 <guimenuitem>Send/Receive</guimenuitem></menuchoice>.
-                </para>
-	    </listitem>
-	  </varlistentry>
-        <varlistentry>
-	    <term>Navigating the Message List with the Keyboard:</term>
-	    <listitem>
-	      <para>
-                Press <keycap>]</keycap> or <keycap>.</keycap> to jump to the next unread
-                message. <keycap>[</keycap> or <keycap>,</keycap> goes to the previous
-                unread message.  Use the arrow keys to move up
-                and down along the list of all messages.
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Move the display up and down in the preview pane:</term>
-	    <listitem>
-	      <para>
-                Press the space bar to go a page down.  Press
-                <keycap>Backspace</keycap> to go a page up.
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Reply to a Message:</term>
-	    <listitem>
-	      <para>
-                To reply to the sender of the message only:
-                click <guibutton>Reply</guibutton> in the
-                toolbar, or press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>R</keycap>
-                </keycombo>
-                </para>
-	      <para>
-                To reply to the sender and all the other visible
-                recipients of the message, click <guibutton>Reply to
-                All</guibutton> or select the message and press
-                <keycombo action="simul">
-		  <keycap>Shift</keycap>
-		  <keycap>Ctrl</keycap>
-		  <keycap>R</keycap>
-                </keycombo>
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  
-          <varlistentry>
-	    <term>Forward a Message:</term>
-	    <listitem>
-	      <para>
-                Select the message or messages you want to forward,
-                and click <guibutton>Forward</guibutton> in the
-                toolbar, or press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>F</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Open a Message in a New Window:</term>
-	    <listitem>
-	      <para>
-                Double-click the message you want to view, or select
-                it and press <keycap>Return</keycap>
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>O</keycap>
-                </keycombo>
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  
-          <varlistentry>
-	    <term>Create Filters and Virtual Folders:</term>
-	    <listitem>
-	      <para>
-                Right-click on a message and select
-                <guimenuitem>Create Rule From
-                Message</guimenuitem>. You can also create filters and
-                virtual folders in the <guimenu>Tools</guimenu> menu.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-
-          <varlistentry>
-	    <term>Add Sender to Address Book:</term>
-	    <listitem>
-	      <para>
-                Right-click on a message and select <guimenuitem>Add
-                Sender to Address Book</guimenuitem>.  You can also
-                right-click on any email address to add it to your
-                address book.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	
-
-
-      </para>
-    </sect1>
-    <sect1 id="quickref-cal">
-      <title>Calendar</title>
-      <para>
-        <variablelist>
-
-	  <varlistentry>
-	    <term>Create a new Appointment:</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Appointment</guimenuitem> </menuchoice>  or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>A</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Task:</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Task</guimenuitem>  </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>T</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term></term>
-	    <listitem>
-	      <para>
-		<tip id="new-appt">
-		  <title>New Appointments Fast</title>
-		  <para>
-		    Click on any blank spot in the calendar and start
-		    typing to create a new appointment entry.
-		  </para>
-		</tip>
-	      </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-
-        </para>
-  </sect1>
-    <sect1 id="quickref-contact">
-        <title>Addressbook</title>
-        <para>
-	Here are shortcuts for the most frequent addressbook actions:
-        <variablelist>
-	  <varlistentry>
-	    <term>Edit a Contact:</term>
-	    <listitem>
-	      <para>
-		You can edit a contact two ways:
-		<itemizedlist>
-		  <listitem>
-		    <para>
-		      Click once on the person's address card and you can
-		      edit the person's properties all in the same window.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Double-click on the contact's card and alter their details.
-		    </para>
-		  </listitem>
-		</itemizedlist>
-               </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-	
-	<variablelist>
-	  <varlistentry>
-	    <term>Deleting a Contact:</term>
-	    <listitem>
-	      <para>
-		Right click on a contact and click <guilabel>Delete</guilabel>
-		or select a contact and press the <guibutton>Delete</guibutton>
-		on the toolbar.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	
-	
-        <variablelist>
-	  <varlistentry>
-	    <term>Email a Contact:</term>
-	    <listitem>
-	      <para>
-		Right click on a contact and select 
-		<guilabel>Send message to contact</guilabel>.
-               </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	
-        <variablelist>
-	  <varlistentry>
-	    <term>Creating a New Contact:</term>
-	    <listitem>
-	      <para>
-                  Double-click in any blank space in the contact
-                  manager to create a new address card.  You can also
-                  use <menuchoice><guimenu>File</guimenu>
-                  <guisubmenu>New</guisubmenu>
-                  <guimenuitem>Contact</guimenuitem> </menuchoice> or
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>C</keycap>
-                </keycombo>
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-  </sect1>
-</appendix>
\ No newline at end of file
diff --git a/help/C/preface.xml b/help/C/preface.xml
deleted file mode 100644
index 2d49b50e26..0000000000
--- a/help/C/preface.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-
-<!-- The actual preface tag is in the evolution.xml file -->
-      <sect1 id="organization">
-        <title>Organization</title>
-      <para>
-        This book is divided into two parts, with several
-        appendices. The first part is a <link linkend="usage">guided
-        tour</link>, which will explain how to use
-        <application>Evolution</application>.  If you are new to
-        <application>Evolution</application> or to groupware in
-        general, this section is for you. The second section, covering
-        <link linkend="config">configuration</link>, is targeted at
-        more advanced users, but anyone who wants to change the way
-        <application>Evolution</application> looks or acts can benefit
-        from reading it.  
-      </para>
-      </sect1>
-
-      <sect1 id="typography">
-        <title>Typographical conventions</title>
-	<para>
-          In this book, we'll mark some words with special typography:
-          <simplelist>
-	    <member><application>Applications</application></member>
-	    <member><command>Commands</command> you type at the command line</member>
-	    <member><guilabel>Labels</guilabel> for buttons and other portions of the graphical interface</member>
-
-            <member> Menu selections look like this:
-                       <menuchoice>
-                          <guimenu>Menu</guimenu>
-                          <guisubmenu>Submenu</guisubmenu> 
-                          <guimenuitem>Menu Item</guimenuitem>
-                     </menuchoice>
-            </member>
-	    <member><guibutton>Buttons</guibutton> you can
-            click</member> <member><userinput>Anything you type
-            in</userinput></member> <member><computeroutput>Text
-            output from a computer</computeroutput></member>
-	  <member><glossterm linkend="apx-gloss">Words</glossterm>
-            that are defined in the <xref linkend="apx-gloss"/>.</member>
-	  </simplelist>
-</para>
-<para>
-We'll provide assorted bits of additional information in tips set off from the rest of the book, as well. 
-
-	  <tip id="example-tip">
-	      <title>Tip</title>
-	      <para>
-		Tips and bits of extra information will look like
-		this.
-	      </para>
-	    </tip>
-</para>
-
-<para>
-Examples are also set off from the rest of the text.  They look like this:
-
-	  <example>
-	    <title>Example Example</title>
-	    <para>
-	      This is what an example looks like.  We'll provide
-	      examples for some of the more complicated tasks you
-	      might be performing.
-	    </para>
-	  </example>
-</para>
-<para>
-  Lastly, we'll have warnings, in cases where you should be careful:
-
-	    <warning id="example-warning">
-	      <title>Example Warning</title>
-	      <para>
-		This is what a warning looks like. If there's a chance
-		you'll run into trouble, we'll warn you beforehand.
-	      </para>
-	  </warning>
-        </para>
-    </sect1>
-
-
-    <sect1 id="other-help">
-      <title>Additional Help Sources</title>
-      <para>
-        You can find additional help in three places. For information
-        about command-line options, open a terminal window and type
-        <command> man evolution</command> or <command>evolution
-        --help</command>. For support, late-breaking news, and errata,
-        visit the Ximian support center at <ulink
-        url="http://support.ximian.com">support.ximian.com</ulink>.
-      </para>
-    </sect1>
-
-    <sect1 id="whats-new-in-one-two">
-      <title>What's New in Evolution &appversion;</title>
-      <para>
-        If you're already familiar with Ximian Evolution 1.2, there
-        are a number of new features in this version. Most of the
-        changes, however, have been made behind the scenes, as we
-        moved to the GNOME 2 platform. Ximian Connector for Microsoft
-        Exchange also has new features, described in <xref linkend="new-in-connector" />.
-        You can find a complete list of bugs fixed and features added
-        in the Evolution release notes at the <ulink
-        url="http://developer.ximian.com">Ximian Developer
-      Website</ulink>. Some of the features include:
-    </para>
-        <variablelist>
-	  <varlistentry>
-	    <term>Better Fonts</term>
-	    <listitem>
-	      <para>
-                Ximian Evolution &appversion; uses the same font
-                smoothing technology as the rest of your GNOME 2
-                desktop.
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Cleaner Shutdowns</term>
-	    <listitem>
-	      <para>
-                We have fixed several bugs that caused Evolution to
-                continue to occupy system resources when it was not
-                running.
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term>Mail Composer HTML Improvements</term>
-	    <listitem>
-	      <para>
-                 The message composer has continued to improve.
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>New Graphics and Icons</term>
-	    <listitem>
-	      <para>
-                We've added new graphics and icons.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-    </sect1>
-
-    <sect1 id="preface-for-experts">
-      <title>Introductory Tips for Experienced Users</title>
-      <para>
-        This section has a few tips for experienced users of Linux or
-        UNIX systems:
-      </para>
-      <variablelist>
-        <varlistentry>
-          <term>Backups and File Locations</term>
-          <listitem>
-            <para>
-              To create a backup of your Evolution data, copy the
-              <guilabel>~/evolution/local/</guilabel> directory to
-              your backup disk.  To access data you
-              have backed up, use the <guilabel>Import</guilabel> tool to 
-              restore individual files as needed.
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>Default Browsers</term>
-          <listitem>
-            <para>
-              To set the browser that opens when you click a link in
-              an email, open the GNOME preferences tool
-              (<menuchoice><guimenu>System</guimenu><guimenuitem>Settings</guimenuitem></menuchoice>
-            or <command>gnome-control-center</command>) and start the
-            <guilabel>File Associations</guilabel> tool. There, look under
-            <guilabel>Internet Services</guilabel>, select
-             <guilabel>World wide web (http)</guilabel>, and select
-             the browser of your choice. If you wish to use a 
-             browser other than the ones suggested, you will need to
-             enter the full shell command. For example you might use 
-             <userinput>mybrowser "%s"</userinput> to start the
-             mybrowser program at the right page.
-           </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term>Making Evolution Your Default Mail Client</term>
-          <listitem>
-            <para>
-              For GNOME desktops, you can set
-              <application>Evolution</application> to be the default
-              mail client, so that it opens when you click a mailto:
-              link in web pages and help tools. To do that, open the
-              GNOME preferences tool and start the <guilabel>File
-              Associations</guilabel> tool.  There, look under
-              <guilabel>Internet Services</guilabel>, select
-              <guilabel>Electronic mail transmission
-              (mailto)</guilabel>, and select
-              <application>Evolution</application> from the drop-down
-              list.
-            </para>
-            <para>
-              For applications such as Mozilla and Netscape, which do
-              not use the GNOME preference tools, you will need to
-              find the protocol handler preference tool for that
-              application and enter <userinput>evolution
-            "%s"</userinput> as your choice for handling mailto links.
-            </para>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-    </sect1>
-  
diff --git a/help/C/topic.dat b/help/C/topic.dat
deleted file mode 100644
index cf9f0ec017..0000000000
--- a/help/C/topic.dat
+++ /dev/null
@@ -1,11 +0,0 @@
-index.html   Table of Contents
-introduction.html Introduction
-usage-mainwindow.html Getting Started
-usage-summary.html The Evolution Summary
-usage-mail.html Getting and Sending Email
-usage-contact.html Using the Contact Manager
-usage-calendar.html Managing Your Schedule
-usage-exchange.html Connecting to Exchange Servers
-config-prefs.html Configuring Evolution
-menuref.html Quick Reference
-apx-gloss.html Glossary
\ No newline at end of file
diff --git a/help/C/usage-calendar.xml b/help/C/usage-calendar.xml
deleted file mode 100644
index d6a4d30594..0000000000
--- a/help/C/usage-calendar.xml
+++ /dev/null
@@ -1,761 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-calendar">
-  <title>Managing your Schedule</title>
-
-     <para>
-      This chapter will show you how to use the Ximian Evolution
-      Calendar to manage your schedule alone or in conjunction with
-      peers. To learn about importing calendar data, see <xref
-      linkend="importing-mail" />, which covers the Import tool.
-     </para>
-
-    <sect1 id ="usage-calendar-view"> 
-    <title>Ways of Looking at your Calendar</title>
-    <para>
-       The toolbar offers you four different views of your calendar:
-       <itemizedlist>
-	<listitem>
-	  <para>
-	    Day
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Work Week
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Week
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Month
-	  </para>
-	</listitem>
-      </itemizedlist>
-</para>
-<para>
-      Press the calendar-shaped buttons on the right side of the toolbar to
-      switch between views. 
-</para>
-<para>
-      You can also select an arbitrary range of days in the small
-      calendar at the upper right.  To do this, click and drag on the
-      days that you wish to view in your calendar.
-    </para>
-    <para>
-       The <guibutton>Prev</guibutton> and <guibutton>Next</guibutton>
-       buttons will move you forward and back in your calendar pages.
-       If you're looking at only one day, you'll see tomorrow's page,
-       or yesterday's.  If you're looking at your calendar by week or
-       month, you'll move around by just that much.
-       To come back to today's listing, click the
-        <guibutton>Today</guibutton> button in the toolbar.
-    </para>
-    <para>
-       To visit a specific date's calendar entries, click
-       <guibutton>Go To</guibutton> and select the date in the dialog
-       box that appears.
-    </para>
-
-  </sect1>
-  <sect1 id="usage-calendar-apts">
-    <title>Scheduling With the Evolution Calendar</title>
-    <para>
-      Of course, you'll want to use the calendar to do more than find
-      out what day it is. This section will tell you how to schedule
-      appointments, set alarms, and determine appointment
-      recurrence. If you have installed the Ximian Connector for
-      Microsoft Exchange, you can also read <xref
-      linkend="full-advantage"/> to learn about how to take full
-      advantage of the collaborative group scheduling functions
-      available on the Microsoft Exchange Server.
-    </para>
-
-    <sect2 id="usage-calendar-apts-basic">
-      <title>Creating appointments</title>
-      <para>
-	To create a new appointment, select
-        <menuchoice>
-	  <guimenu>File</guimenu>
-	  <guisubmenu>New</guisubmenu> 
-	  <guimenuitem>Appointment</guimenuitem>
-	</menuchoice>
-	or click the <guibutton>New Appointment</guibutton> button on the left end
-	of the toolbar. The <interface>New Appointment</interface>
-	dialog will pop up with the menu bar, tool bar, and
-	window full of choices for you.
-      </para>
-      <tip id="new-appointment-shortcut">
-        <title>Shortcut</title>
-        <para>
-           If you don't need to enter more information than the date
-           and time of the appointment, you just click in any blank
-           space in the calendar and start typing. You can enter other
-           information later with the appointment editor.
-        </para>
-      </tip>
-
-      <para>
-        Your appointment must have a starting and ending date (by
-        default, today) but you can choose whether to give it
-        starting and ending times or to mark it as an <guilabel>All
-        day event</guilabel>. An <guilabel>All day event</guilabel>
-        appears at the top of a day's appointment list, in the grey header under the date, rather than inside
-        it.  That makes it easy to have appointments that overlap and fit
-        inside each other.  For example, a conference might be an all
-        day appointment, and the meetings at the conference would be timed
-        appointments.  Of course, appointments with specific starting and ending
-        times can also overlap.  When they do they're displayed as
-        multiple columns in the day view of the calendar.
-      </para>
-      <para>
-	<application>Evolution</application> supports the use of
-	timezones.  If you share calendar files with friends or
-	co-workers, it is quite possible you will need to configure
-	your timezone.  To configure your timezone:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select 
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Settings</guimenuitem> </menuchoice>, and
-		click the <guilabel>Calendar And Tasks</guilabel> icon
-		in the settings dialog.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Globe</guibutton> button in the
-	      <guilabel>Time</guilabel> section, located in the
-	      <guilabel>General</guilabel> tab.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Each red dot represents a major city.  Click a dot and click <guibutton>OK</guibutton> to select your time zone.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	You can also configure timezone information specific to the
-	Start and End time in each appointment.  To do that, simply
-	create a new appointment and click on a globe to customize the
-	timezone that the time exists in. For example, if you live in
-	New York but have a telephone meeting set for noon with
-	someone in California, you need to make sure that you're not
-	calling each other a few hours off.  Setting time-zones on a
-	per-appointment basis helps avoid that potential confusion.
-      </para>
-      <note>
-       <title>Multiple Simultaneous Appointments</title>
-         <para>
-           If you create calendar appointments that overlap,
-           <application>Evolution</application> will display them side
-           by side in your calendar.  However,
-           <application>Evolution</application> cannot help you do
-           multiple things at once.
-         </para>
-      </note>
-      <para>
-         You can have several
-         <guilabel>Reminders</guilabel>, any time prior to the appointment
-         you've scheduled.  You can have one reminder of each of the following types:
-          <variablelist>
-           <varlistentry>
-	    <term><guilabel>Display:</guilabel></term>
-	    <listitem>
-	      <para>
-	        A window will pop up on your screen to remind you of
-	        your appointment.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term><guilabel>Audio:</guilabel></term>
-	    <listitem>
-	      <para>
-	        Choose this to have your computer deliver a sound
-	        alarm.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Program:</guilabel></term>
-	    <listitem>
-	      <para>
-	        Select this if you would like to run a program as a
-	        reminder.  You can enter its name in the text field,
-	        or find it with the <guibutton>Browse</guibutton>
-	        button.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>	    
-      </para>
-
-
-       <note id="reminders-when-not-running-evo">
-         <title>Reminders Without Evolution</title>
-         <para>
-            If you have stored reminders in a local calendar, they
-          will work from the moment you log in. However, for reminders
-          stored on an Exchange server, you must run Evolution at
-          least once after logging in. No matter where the reminders
-          are stored, you can quit Evolution and still be reminded of
-          an upcoming appointment.
-         </para>
-        </note>
-
-      <para>
-         <guilabel>Classification</guilabel> 
-         only applies to calendars on a
-         network. <guilabel>Public</guilabel> is the default category,
-         and a public appointment can be viewed by anyone on the calendar
-         sharing network.  <guilabel>Private</guilabel> denotes one
-         level of security, and <guilabel>Confidential</guilabel> an even 
-         higher level.
-      </para>
-      <para>
-	<application>Evolution</application> can handle free/busy
-	scheduling Using the Ximian Connector on a Microsoft Exchange
-	2000 server. For more information about Ximian Connector, see
-	<xref linkend="usage-exchange"/>.
-      </para>
-      <para>
-	To set your appointment to be free or busy, simply click the
-	box in the <guilabel>Show Time As</guilabel> section in the
-	<guilabel>Appointment Editor</guilabel>.
-      </para>
-      <para>
-        <application>Evolution</application> lets you categorize your
-	appointments, which can help if you lead a busy life.  The bottom
-	section of the <guilabel>Appointment</guilabel> tab is where your
-	categorization is done.
-      </para>
-      
-      <tip>
-      <title>Adding a New Appointment Category</title>
-	<para>
-	 You can add a new category to your category list by clicking on
-         <guibutton>Edit Master Category List</guibutton> and single-clicking
-	 on <guilabel> Click here to add a category</guilabel>.
-	</para>
-      </tip>
-
-      <para>
-	 The purpose of categories is to let you view all appointments which have
-	 similar activities.  To do this, change <guilabel>Any field contains</guilabel>
-	 to <guilabel>Has category</guilabel> and enter your category at right.
-      </para>
-
-      <para>
-	Clicking on the <guibutton>Categories</guibutton> button opens up the category
-	list.  To associate a category to an appointment, simply click the check box. 
-      </para>
-      <para>
-	Once you've selected your categories, click <guibutton>OK</guibutton> to
-	assign these categories to the appointment.  The categories you selected are now
-	listed in the text box to the right of the <guibutton>Categories...</guibutton>
-	button.
-      </para>
-
-      <para>
-        The <guilabel>Recurrence</guilabel> tab lets you describe
-        repetition in appointments ranging from once every day up to once
-        every 100 years.  You can then choose a time and date when the
-        appointment will stop recurring, and, under
-        <guilabel>Exceptions</guilabel>, pick individual days when the
-        appointment will <emphasis>not</emphasis> recur. Make your
-        selections from left to right, and you'll form a sentence:
-        "Every two weeks on Monday and Friday until January 3, 2003"
-        or "Every month on the first Friday for 12 occurrences."
-      </para>
-
-      <para>
-	Once you're done with all those settings, click on the disk
-	icon in the toolbar to save and close the appointment editor window. 
-	If you want, you can alter an appointment
-	summary in the calendar view by clicking on it and typing. You
-	can change other settings by right-clicking on the appointment then
-	choosing <guimenuitem>Open</guimenuitem>.
-      </para>
-    </sect2>
-    <sect2 id="usage-calendar-rsvp">
-      <title>Sending an RSVP with the Calendar</title>
-      <para>
-	<application>Evolution</application> can be used to schedule
-	group meetings and help you manage responses to meeting
-	requests.
-      </para>
-      <para>
-	When you create a meeting or group appointment, you can
-	specify the attendees in several categories, such as "chair"
-	or "required."  When you save the appointment listing, each
-	attendee will be sent an email with the appointment
-	information and gives them the option to respond.
-      </para>
-
-      <note id="meeting-announce">
-       <title>Simple Announcements</title>
-        <para>
-           If you don't need to collect attendance information when
-           you're scheduling an event, and would rather just announce
-           it, select
-           <menuchoice><guimenu>Actions</guimenu><guimenuitem>Forward
-           as iCalendar</guimenuitem></menuchoice>.  That will open a
-           new email message with the event notification attached as
-           an announcement.  Recipients will be able to add the event
-           to their calendars with one click, but won't automatically
-           send you email about whether they'll attend.
-        </para>
-     </note>
-
-      <para>
-	To schedule a meeting:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select
-	      <menuchoice>
-		<guimenu>Actions</guimenu> <guimenuitem>Schedule
-		Meeting</guimenuitem> </menuchoice>.  The
-		<guilabel>Scheduling</guilabel> and
-		<guilabel>Meeting</guilabel> tabs open.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      If you have multiple Evolution email accounts, choose the
-	      one you'll use by selecting an item in the
-	      <guilabel>Organizer</guilabel> field.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the space labeled <guilabel>Click here to add an
-	      attendee</guilabel> to enter the names and email
-	      addresses of people you will invite, or click the
-	      <guibutton>Invite Others</guibutton> to select them from
-	      your addressbook.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Save the Appointment.
-	    </para>
-	  </listitem>
-	</orderedlist>
-	An email is now sent out to all the recipients, inviting them to your event.
-      </para>
-    </sect2>
-    <sect2 id="replying-to-rsvp">
-      <title>Replying to a Meeting Request</title>
-      <para>
-	Meeting requests are sent as iCal attachments.  To view or
-	respond to one, click on the attachment icon and view it
-	inline in the mail window.  All the details are shown about
-	the event including time and dates.  Then you can choose how
-	to reply to the invitation.  Your choices are:
-	<itemizedlist>
-	  <listitem>
-	    <para>
-	      Accept
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Tentatively Accept
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Decline
-	    </para>
-	  </listitem>
-	</itemizedlist>
-	Click <guibutton>OK</guibutton> and an email will be sent to
-	the organizer with your answer.  The event will also be added
-	to your calendar if you accept.
-      </para>
-
- <para>
-        Note, however, that if you add a meeting to your calendar,
-        there are some limitations: only the organizer of a meeting
-        can add participants in a meeting. Your only options, as a
-        participant, are to accept the meeting, or decline it. 
-      </para>
-      <para>
-        Once you have added the meeting to your calendar, you can make
-        changes to your copy-- change the description, mark yourself
-        the organizer, invite more people, and so forth-- but be aware
-        that if the original organizer sends out another update, your
-        changes may be overwritten.
-      </para>
-   <note id="organizer-only-one">
-     <title>There Can Be Only One</title>
-      <para>
-         A meeting can have only one organizer. You can designate
-         yourself the organizer of the meeting, but unless you
-         coordinate that action with the organizer you are replacing,
-         you could create confusion in the scheduling process. If you
-         want to invite additional people to a meeting without
-         changing the organizer, it's best to forward the first
-         organizer's message to the additional participants.
-      </para>
-    </note>
-    </sect2>
-
-    <sect2 id="receiving-rsvp-response">
-      <title>Getting Responses to Meeting Requests</title>
-      <para>
-	Once you get a reply to your meeting invitation, you'll need
-	to view it inline in the email.  Click the attachment and
-	select <guibutton>View Inline</guibutton>.  At the bottom, you
-	can click <guibutton>OK</guibutton> to update your attendee
-	list.
-      </para>
-    </sect2>
-
-<!-- ############UNIMPLEMENTED FEATURES ###################
-
-    <sect2 id="usage-calendar-apts-group">
-      <title>Appointments for Groups</title>
-      <para>
-	You can use <application>Evolution</application> to mark a
-	meeting request on another person's calendar.  To do it, click
-	<guibutton>New</guibutton> in the calendar toolbar, or select
-	<menuchoice> <guimenu>File</guimenu>
-	<guisubmenu>New</guisubmenu>
-	<guimenuitem>Appointment</guimenuitem> </menuchoice> to bring
-	up the <interface>new appointment</interface> window.  Then
-	describe the appointment as you would any other. When you are
-	ready to send the invitation <guibutton>OK</guibutton>
-	<application>Evolution</application> will automatically send
-	email to each person on the request list, notifying of the
-	time and date of the meeting you have requested with them.  In
-	addition, it will mark the appointment on your calendar and on
-	theirs as tentative, rather than a confirmed, appointment.
-      </para>
-      <para>
-	To mark a tentative appointment as confirmed, click once on the
-	appointment in the <interface>calendar view</interface> to select
-	it, and then choose <guimenuitem>Appointment
-	Properties</guimenuitem> from the <guimenu>Settings</guimenu>
-	menu.  In the <interface>Appointment Properties</interface> dialog
-	window, click the "tentative" button to De-select the
-	appointment.
-      </para>
-      <para>
-        When your meeting attendees get the email inviting them to the
-        meeting, they'll be able to enter the information into their
-        calendars and let you know if they'll be able to attend; if
-        they use <application>Ximian Evolution</application> or
-        another iCal compliant mail client, they can do this with just
-        one click. When you get a response from them, it will include
-        an iCal attachment. Opening and accepting this attachment will
-        change the meeting data in your calendar to indicate that they
-        have responded to your invitation, and whether they will be in
-        attendance.
-     </para>
-    </sect2>
-
-
-    <sect2 id="usage-calendar-apts-privs">
-      <title>Scheduling privileges</title>
-      <para>
-	There are several levels of scheduling privileges.  You
-	can set whether people can see your calendar, whether they
-	can request meetings or appointments, and whether they can
-	create appointments.  This section may have to be deleted,
-	because I don't know if we are going to support privileges
-	at all.
-      </para>
-    </sect2>
- ########## END UNIMPLEMENTED FEATURESET ############ -->
-    <sect2 id="usage-calendar-freebusy">
-      <title>Scheduling Meetings and The Free/Busy View</title>
-      <para>
-        In addition to the standard meeting scheduling tools, you can
-	 use the Free/Busy view to check whether people are available
-	 in advance. At this time, the Free/Busy feature only works
-	 with Microsoft Exchange servers. However, you can still use
-	 iCal event invitations to coordinate schedules with other
-	 people no matter what server you're using.
-      </para>
-      <para>
-	To access the free/busy view:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Open or create an appointment in the
-	      <guilabel>Calendar</guilabel> window.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click
-	      <menuchoice>
-		<guimenu>Actions</guimenu>
-		<guimenuitem>Schedule Meeting</guimenuitem>
-	      </menuchoice>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Open the <guilabel>Scheduling</guilabel> tab.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-
-      <figure>
-        <title>Appointment Scheduling Window</title>
-	<screenshot>
-	  <screeninfo>Appointment Scheduling Window</screeninfo>
-	  <mediaobject><imageobject>
-	      <imagedata  format="PNG" fileref="figures/schedule"
-	  srccredit="Kevin Breit"/>
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-
-      <para>
-	<inlinemediaobject>
-	  <imageobject>
-	    <imagedata fileref="figures/full-1" format="PNG"/>
-	  </imageobject>
-	</inlinemediaobject>
-	<guilabel>Invitee List</guilabel>
-      </para>
-      <para>
-	The <guilabel>Invitee List</guilabel> lists off the people who
-	have been invited to the respective appointment.  It also
-	shows their RSVP status.
-      </para>
-      <para>
-	<inlinemediaobject>
-	  <imageobject>
-	    <imagedata fileref="figures/full-2" format="PNG"/>
-	  </imageobject>
-	</inlinemediaobject>
-	<guilabel>Schedule Grid</guilabel>
-      </para>
-      <para>
-	The <guilabel>Schedule Grid</guilabel> shows the invitee's
-	published Free/Busy information.  This is where you compare
-	people's schedules to find free time to schedule the
-	appointment.
-      </para>
-      <para>
-	<inlinemediaobject>
-	  <imageobject>
-	    <imagedata fileref="figures/full-3" format="PNG"/>
-	  </imageobject>
-	</inlinemediaobject>
-	<guilabel>Meeting Scheduler</guilabel>
-      </para>
-      <para>
-	The <guilabel>Meeting Scheduler</guilabel> allows you to
-	schedule the meeting in the <guilabel>Free/Busy</guilabel> window.
-      </para>
-      <sect3 id="usage-calendar-freebusy-scheduling">
-	<title>Scheduling an Appointment</title>
-	<para>
-	  To schedule an appointment, you'll first need people's
-	  free/busy information.  If you're using the Ximian Connector
-	  for Microsoft Exchange, all of the information is already
-	  available to you in the Global Address List. Otherwise, each
-	  person will have to email you their schedule files and you
-	  will have to incorporate them into your calendar.
-        </para>
-        <para>
-          Regardless of how you get the information, Ximian Evolution
-          will display it in the <guilabel>Scheduling</guilabel> tab.
-          The pending appointment time will appear in white with bold
-          black borders.  Each attendee's free and busy times appear
-          color-coded next to their names in the attendee list.
-	</para>
-        <para>
-          Adjust the meeting time, either by dragging the meeting
-          borders or by using the <guilabel>Autopick</guilabel>
-          buttons to choose a time automatically, then click
-          <guibutton>Save and Close</guibutton>.  Attendees on an
-          Exchange server will have the appointment updated
-          automatically; others will receive email notification of any
-          change in plans.
-        </para>
-
-        <para>
-         Read <xref linkend="full-advantage"/> to learn about how to
-	 use this feature with the Ximian Connector for Microsoft
-	 Exchange.
-       </para>
-      </sect3>
-    </sect2>
-
-  </sect1>
-
-  <sect1 id="usage-calendar-todo">
-   <title>The Task Pad</title>
-    <para>
-       The Task Pad, located in the lower right corner of the
-       calendar, lets you keep a list of tasks separate from your
-       calendar appointments.  You can use the list
-       in a larger window by choosing the <guibutton>Tasks</guibutton>
-       button in the shortcut bar or in the folder tree.
-    </para>
-    <para>
-       To record a new task, click the <guibutton>Add</guibutton>
-       button in the toolbar.  <application>Evolution</application>
-       will pop up a small window with five items in it:
-     
-        <variablelist>
-	<varlistentry>
-	  <term> <guilabel>Summary:</guilabel></term>
-	  <listitem>
-            <para>
-              The description you enter here will appear in the To Do
-              list itself.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term> <guilabel>Due Date:</guilabel></term>
-	  <listitem>
-	    <para>
-	      Decide when this item is
-	      due.  You can either type in a date and time, or select one from
-	      the <guibutton>Calendar</guibutton> and time drop-down menus.
-          </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Start Date:</guilabel></term>
-	  <listitem>
-	    <para>
-	      The date you intend to start working.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term> <guilabel>Description:</guilabel></term>
-	  <listitem>
-	    <para>
-              If you wish, you can keep a more detailed description of
-              the item here. For example, you can note that a task is
-              in progress, and display how close it is to completion.
-            </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Classification:</guilabel></term>
-	  <listitem>
-	    <para>
-	      Sets who will see it if your calendar is shared.
-	    </para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-    </para>
-    <para>
-      There are more options in the <guilabel>Details</guilabel> tab such as priority and progress settings.
-    </para>
-    <para>
-       Once you've added a task to your to-do list, its summary
-       appears in the <guilabel>Summary</guilabel> section of task
-       list.  To view or edit a detailed description of an item,
-       double-click on it, or right click on it and select <guibutton>Open</guibutton>.  You can delete items by selecting
-       them and clicking on the <guibutton>Delete</guibutton> button.
-    </para>
-    <para>
-      The list of tasks is sorted in a similar way to the list of
-      email messages in <application>Ximian Evolution
-      Mail</application>.  Click once on the message headers to change
-      the direction and type of sorting, or right-click to add or
-      remove columns from the display.
-    </para>
-    <sect2 id="task-folders">
-      <title>Folders for Your Tasks</title>
-      <para>
-	Like any other component in
-	<application>Evolution</application>, you can create a folder
-	to help organize your tasks.  To do this:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Open the <guilabel>Folders Bar</guilabel>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>Tasks</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Right click on <guibutton>Tasks</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <menuchoice><guimenuitem>Create New Folder</guimenuitem></menuchoice>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Enter the folder name.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>OK</guibutton>
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="usage-calendar-multiple">
-    <title>Multiple Calendars</title>
-    <para>
-       <application>Evolution</application> permits you to have and
-       maintain multiple calendars.  This is useful if you maintain
-       schedules for other people, if you are responsible for resource
-       or room allocation, or if you have multiple personalities.
-    </para>
-   
-    <example>
-      <title>Keeping Multiple Calendars</title>
-      <para>
-        Lucy, the office manager for a small company, has one calendar
-        for her own schedule. She maintains one for the conference
-        room, to schedule meetings.  Next to that, she maintains a
-        calendar that reflects when consultants are going to be on
-        site, and another that keeps track of when the Cubs are
-        playing.
-      </para>
-    </example>
-    <para>
-      To create a new calendar, select 
-      <menuchoice>
-	<guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
-	<guimenuitem>Folder</guimenuitem>
-      </menuchoice>.
-       You'll need to tell the <guilabel>New Folder</guilabel> dialog that the new folder should be of the calendar type.  You can place the calendar in any calendar folder and access it
-       from the folder view.
-    </para>
-    <para>
-       Each calendar folder can hold only one calendar.
-    </para>
-  </sect1>
-</chapter>
diff --git a/help/C/usage-contact.xml b/help/C/usage-contact.xml
deleted file mode 100644
index 821b959c95..0000000000
--- a/help/C/usage-contact.xml
+++ /dev/null
@@ -1,581 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-contact">
-  <title>Working with Your Contacts</title>
-      <para>
-        This chapter will show you how to use the
-        <application>Evolution</application> addressbook to organize
-        any amount of contact information, share addresses over a
-        network, and several ways to save time with everyday tasks. To
-        learn about configuring the addressbook, see <xref
-        linkend="config-prefs-contact"/>. You can import contacts from
-        other contact management tools with the Import tool by
-        selecting
-        <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice>,
-        or by mailing them to yourself as vCard attachments.
-      </para>
-
-    <para>
-       The toolbar for the addressbook is quite simple.
-       <itemizedlist>
-	<listitem><para>
-	  Click <guibutton>New Contact</guibutton> to create a new card, or double-click 
-	  in a blank space in the contact list. 
-	</para></listitem>
-
-	<listitem><para>
-           Click <guibutton>New List</guibutton> to create a new card, or double-click 
-           in a blank space in the contact list. 
-	</para></listitem>
-
-	<listitem><para> The <guiicon>printer</guiicon> icon sends one
-	    or more of your cards to the printer.  </para></listitem>
-
-        <listitem><para> The <guiicon>stop sign</guiicon> icon stops loading
-           contact data from the network.  This button is only
-           relevant if you are looking at contact information on a
-           network.  </para></listitem>
-      </itemizedlist>
-    </para>
-
-    <para>
-       Your contact information fills the rest of the display.  Move
-       through the cards alphabetically with the buttons and the
-       scrollbar to the right of the window. Of course, if you have
-       more than a few people listed, you'll want some way of finding
-       them more quickly, which is why there's a search feature.
-    </para>
-
-  <sect1 id="usage-contact-cards">
-    <title>The Contact Editor</title>
-    <para>
-      To delete a contact:
-      <orderedlist numeration="arabic">
-	<listitem>
-	  <para>
-	    Click once on the contact.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Press the <guibutton>Delete</guibutton> button.
-	  </para>
-	</listitem>
-      </orderedlist>
-    </para>
-    <para>
-       If you want to add or change cards, you'll use the contact
-       editor.  To change a card that already exists, double click on
-       it to open the contact editor window.  If you want to create a new
-       card, clicking the <guibutton>New</guibutton> button in the
-       toolbar will open the same window, with blank entry boxes for
-       you to fill in.
-    </para>
-    
-    <para>
-      The contact editor window has three tabs,
-      <guilabel>General</guilabel>, for basic contact information,
-      <guilabel>Details</guilabel>, for a more specific description of
-      the person, and <guilabel>Collaboration</guilabel> for
-      information about scheduling and working closely with them.  In
-      addition, it contains a <guimenu>File</guimenu> menu and an
-      <guimenu>Actions</guimenu> menu. Under
-      <guimenu>Actions</guimenu> you will find <guimenuitem>Forward
-      Contact</guimenuitem>, which opens a new message with the card
-      already attached, and <guimenuitem>Send Message to
-      Contact</guimenuitem>, which will open a new message to the
-      contact.
-      </para>
-      <para>
-      The toolbar is relatively simple: <guilabel>Save and
-      Close</guilabel>, <guilabel>Print</guilabel>,
-      <guilabel>Close</guilabel>, and <guilabel>Delete</guilabel>.
-      </para>
-   
-    
-    <figure id="usage-contact-editor-fig">
-      <title>Evolution Contact Editor</title>
-      <screenshot>
-	<screeninfo>Evolution Contact Editor</screeninfo>
-	<mediaobject><imageobject><imagedata
-	fileref="figures/contact-editor" format="PNG" srccredit="Aaron
-	Weber"/>
-	</imageobject></mediaobject>
-      </screenshot>
-    </figure>
-    
-    <para> The <guilabel>General</guilabel> tab has seven sections,
-      each with an icon: a face, for name and company; a telephone
-      for phone numbers; an envelope for email address; a globe for
-      web page address; a house for postal address; a file folder
-      for contacts, and a briefcase for categories. 
-    </para>
-    <para>
-     <variablelist>
-	
-	<varlistentry>
-	  <term>Full Name</term>
-	  <listitem>
-	    <para>
-              The <guilabel>Full Name</guilabel> field has two
-              major features:
-              <itemizedlist>
-		<listitem>
-		  <para>
-                    You can enter a name into the <guibutton>Full
-                    Name</guibutton> field, but you can also click the
-                    <guibutton>Full Name</guibutton> button to bring
-                    up a small dialog box with a few text boxes
-                    <variablelist>
-		      <varlistentry>
-			<term><guilabel>Title: </guilabel></term>
-			<listitem> <para>
-	                  Enter an honorific or select one from the menu.
-	                </para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>First: </guilabel></term>
-			<listitem> <para>
-		            Enter the first, or given, name.
-			 </para></listitem> 
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Middle: </guilabel></term>
-			<listitem> <para>
-			  Enter the middle name or initial, if any.
-			</para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Last: </guilabel></term>
-			<listitem> <para>
-			   Enter the last name (surname).
-			 </para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Suffix: </guilabel></term>
-			<listitem> <para>
-			   Enter suffixes such as "Jr." or "III."
-			</para></listitem>
-		      </varlistentry>
-		    </variablelist>
-                   </para>
-		</listitem>
-	      </itemizedlist>
-	      </para>
-		<para>
-		  The <guilabel>Full Name</guilabel> field also
-		  interacts with the <guilabel>File As</guilabel>
-		  box to help you organize your contacts.
-		</para>
-	    <para>
-		  To see how it works, type a name in the
-		  <guilabel>Full Name</guilabel> field. As an example,
-		  we'll use the Ximian mascot, <userinput>Rupert
-		  T. Monkey</userinput>.  You'll notice that the
-		  <guilabel>File As</guilabel> field also fills in,
-		  but in reverse: <computeroutput>Monkey,
-		  Rupert</computeroutput>.  You can pick
-		  <computeroutput>Rupert Monkey </computeroutput> from
-		  the drop-down, or type in your own, such as
-		  <userinput> T. Rupert Monkey </userinput>.
-		</para>
-	    <tip>
-	      <title>Filing Suggestion</title>
-	      <para>
-		 Don't enter something entirely different from the
-		 actual name, since you might forget that you've filed
-		 Rupert's information under "F" for "Fictitious Ximian
-		 Employee."
-              </para>
-	    </tip>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term>Multiple Values for Fields:</term>
-            <listitem>
-	      <para>
-                If you click on the downward pointing triangle buttons
-                next to the <guilabel>Primary Email</guilabel> field,
-                you can also choose <guilabel>Email 2</guilabel> and
-                <guilabel>Email 3</guilabel>.  Although the contact
-                editor will only display one of those at any given
-                time, <application>Evolution</application> will store
-                them all.  Entries that have information in them have
-                a check mark next to them.  The buttons next to the
-                telephone and postal address fields work in the same
-                way.
-              </para>
-          </listitem>
-	</varlistentry>
-      </variablelist>
-     </para>
-     <para>
-      The last item in the <guilabel>General</guilabel> tab is the
-       <guilabel>Categories</guilabel> organization tool; for
-       information on that, read <xref
-       linkend="usage-contact-organize"/>.
-     </para>
-     <para>
-       The <guilabel>Details</guilabel> tab is much simpler:
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    The briefcase - Describes the person's professional life
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    The face - Describes the person's personal life
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    The globe - Miscellanious notes
-	  </para>
-	</listitem>
-      </itemizedlist>
-
-      <tip>
-	<title>Contact Shortcuts</title>
-	<para>
-	  You can add cards from within an email message or calendar
-	  appointment.  While looking at an email, right-click on
-	  any email address or message, and choose
-	  <guimenuitem>Create Card for this Address</guimenuitem> or
-	  <guimenuitem>Create Card for this Sender</guimenuitem>
-	  from the menu.
-	</para>
-      </tip>
-    </para>
-  </sect1>
-
-  <sect1 id="contact-search">
-    <title>Searching for Contacts</title>
-    <para>
-      <application>Evolution</application> allows searching through contacts
-      quickly and easily.
-    </para>
-    <para>
-      To search through contacts:
-      <orderedlist numeration="arabic">
-	<listitem>
-	  <para>
-	    Select your search focus in the search bar.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Enter your query.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Press return to search.
-	  </para>
-	</listitem>
-      </orderedlist>
-    </para>
-    <para>
-      To perform a complex search through your contacts:
-      <orderedlist numeration="arabic">
-	<listitem>
-	  <para>
-	    Open
-	    <menuchoice>
-	      <guimenu>Tools</guimenu>
-	      <guimenuitem>Search for contacts</guimenuitem>
-	    </menuchoice>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Name the rule in the <guilabel>Rule Name</guilabel> field.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Setup your criteria information in the <guilabel>If</guilabel> section.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    If you want to add more criteria, click the <guibutton>Add
-	    Criterion</guibutton> button.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Click <guibutton>Search</guibutton>.
-	  </para>
-	</listitem>
-      </orderedlist>
-    </para>
-    <para>
-      To show all your contacts, select <guibutton>Show All</guibutton> in the
-      <guilabel>Search Bar</guilabel> or search with an empty query.
-    </para>
-
-  </sect1>
-
-  <sect1 id="usage-contact-organize">
-    <title>Organizing your Addressbook</title>
-    <para>
-       Organizing your addressbook is a lot like organizing your
-       mail.  You can have folders and searches the same way you can
-       with mail, but the addressbook does not allow Virtual Folders.  It
-       does, however, allow each card to fall under several
-       categories, and allow you to create your own categories.  To
-       learn about categories, read <xref
-       linkend="usage-contact-organize-group-category"/>.
-    </para>
-
-<!-- UNIMPLEMENTED FEATURE
-    <para>
-      Another useful <application>Evolution</application> feature is
-      its ability to recognize when people live or work together.  If
-      several people in your addressbook share an address, and you
-      change the address for one of them,
-      <application>Evolution</application> will ask you if you wish to
-      change the address for all of them, or just for one.
-    </para>
--->
-
-    <sect2 id="usage-contact-organize-group">
-      <title>Groups of contacts</title>
-      <para>
-         <application>Evolution</application> offers two ways for you
-         to organize your cards.  The first way is to use folders;
-         this works the same way mail folders do.  For more
-         flexibility, you can also mark contacts as elements of
-         different categories.  To better integrate with email tools,
-         you can also create lists of contacts that you can send mail
-         to as a single person.
-      </para>
-
-      <sect3 id="usage-contact-organize-group-folder">
-	<title>Grouping with Folders</title>
-	<para>
-	   The simplest way to group address cards is to use folders.
-	   By default, cards start in the
-	   <guilabel>Contacts</guilabel> folder.  If you've read <xref
-	   linkend="usage-mainwindow"/> then you already know that you
-	   can create a new folder by selecting 
-           <menuchoice>
-           <guimenu>File</guimenu>
-	   <guisubmenu>New</guisubmenu>
-	   <guimenuitem>Folder</guimenuitem>
-           </menuchoice>
-           and that you can put new folders anywhere you like. Just
-	   like with mail, cards must be in a card folder, and no card
-	   can be in two places at once.  If you want more
-	   flexibility, try <xref
-	   linkend="usage-contact-organize-group-category"/>.
-	 </para>
-	<para>
-          To put a card into a folder, just drag it there from the
-          folder view.  Remember that contact cards can only go in
-          contact folders, just like mail can only go in mail folders,
-          and calendars in calendar folders.
-         </para>
-      </sect3>
-      
-      <sect3 id="usage-contact-organize-group-category">
-	<title>Grouping with Categories</title>
-	<para>
-           The other way to group cards is to mark them as belonging
-           to different categories.  
-           That means that you
-           can mark a card as being in several categories or no
-           category at all.  For example, I put my friend Matthew's
-           card in the "Business" category, because he works with me,
-           the "Friends" category, because he's also my friend, and
-           the "Frequent" category, because I call him all the time
-           and can never remember his phone number.  
-        </para>
-	<para>
-           To mark a card as belonging to a category, click the
-           <guibutton>Categories</guibutton> button at the lower
-           right.  From the dialog box that appears, you can check as
-           many or as few categories as you like.
-        </para>
-
-       <!-- Feature Not Implemented
-	<para>
-
-           If the master list of categories doesn't suit you, you can
-           add your own.  Just enter the new category's name in the
-           text box, then click <guibutton>Categories</guibutton> and
-           choose <guilabel>Add to Master List</guilabel> in the
-           window that appears. 
-         </para>
-       -->
-
-      </sect3>
-
-      <sect3 id="usage-contact-organize-group-list">
-	<title>Creating a List of Contacts</title>
-	<para>
-           To create a list of contacts:
-
-         <orderedlist numeration="arabic">
-	    <listitem>
-	      <para>
-                Open the list creation dialog box by clicking the
-                <guibutton>New List</guibutton> button or selecting
-                 <menuchoice>
-		  <guimenu>
-                     File
-                  </guimenu>
-		  <guisubmenu>
-                      New
-                   </guisubmenu>
-		  <guimenuitem>
-                     Contact List
-                   </guimenuitem>
-		</menuchoice>.
-               </para>
-	    </listitem>
-	    
-	    <listitem>
-	      <para>
-                Enter a name for the list.
-              </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-                Enter names or email addresses of contacts, or just
-	        drag contacts from the main window into the list.
-              </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-                 Choose whether you would like to hide the email
-                 addresses when you send a message to the list.
-                 Unless it is a very small list, it is recommended
-                 that you leave the addresses hidden.  This is the
-                 same thing as using the "Bcc:" feature discussed in
-                 <xref linkend="usage-mail-getnsend-send-to-types"/>.
-              </para>
-	    </listitem>
-	    
-	  </orderedlist>
-        </para>
-	<para>
-           When you are done, click <guibutton>OK</guibutton>. The
-           list will appear as a contact card, which you can use as
-           you would any other. That includes emailing the list to
-           another person, and, of course, sending email to the list.
-        </para>
-	<para>
-           To mail the list, open a new email and type the name you
-           chose for the list. Ximian Evolution will address the
-           message to the entire list when you send it. You can also
-           right-click on the list's address card in the Addressbook
-           and select <guimenuitem>Send Message to List</guimenuitem>.
-        </para>
-        <para>
-           Ximian Evolution cannot store contact lists on Exchange
-           servers.
-        </para>
-
-      </sect3>
-    </sect2>
-  </sect1>
-  
-  <sect1 id="usage-contact-sharing">
-    <title>LDAP: Shared Addressbooks on a Network</title>
-
-    <para>
-      The <glossterm linkend="ldap">LDAP</glossterm> protocol was
-      created to let users share contact information over a network by
-      sharing access to a central address book.  LDAP allows a company
-      to maintain a shared set of contact information for a company or
-      department.  Many companies keep a common LDAP address book for
-      all their employees or for client contacts.
-    </para>
-
-    <para>
-       To learn how to add a remote directory to your available
-       contact folders, see <xref linkend="config-prefs-contact"/>.
-       Once you have a LDAP connection, the network contacts folder or
-       folders will appear inside the <guilabel>External
-       Directories</guilabel> folder in the folder bar.  It will work
-       exactly like a local folder of cards, with the following
-       exceptions:
-       <itemizedlist>
-	  
-          <listitem>
-	    <para>
-              Network folders are only available when you are
-              connected to the network.  If you use a laptop or have a
-              modem connection, you may wish to copy or cache the
-              network directory.  You do this by dragging and dropping
-              your desired contacts into the local contacts list.
-	    </para>
-	  </listitem>
-	  
-          <listitem>
-	    <para>
-              To prevent excess network traffic,
-              <application>Evolution</application> will not normally
-              load the contents of LDAP folders immediately upon
-              opening.  You must click <guilabel>Display
-              All</guilabel> before LDAP folder cards will be loaded
-              from the network. You can change this behavior in the
-              <interface>Contact Preferences</interface> window.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-              You cannot add, delete, or alter cards on the LDAP
-              server. If you need to change information there, you
-              will need to speak to your system administrator
-	    </para>
-	  </listitem>
-	</itemizedlist>
-    </para>
-    <sect2 id="usage-contact-sharing-setup">
-      <title>Configuring Evolution to use LDAP</title>
-      <para>
-	For information about setting up
-	<application>Evolution</application> to use LDAP, please refer
-	to <xref linkend="config-prefs-contact" />
-      </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="contact-automation-basic">
-    <title>Send me a Card: Adding New Cards Quickly</title>
-    <para>
-      As noted before, when you get information about a person in
-      the mail or in a calendar entry, you can add it to an address
-      card.  To do so, right click on any email address or email
-      message, and select <guimenuitem>Add Sender to Address Book</guimenuitem> from the menu that appears.
-      <application> Evolution</application> can also add cards from a
-      hand-held device during HotSync operation.  For more
-      information about that, see <xref linkend="usage-sync"/>.
-    </para>
-  </sect1>
-  
-<!-- Unimplemented features:
-      <para>
-         You can also use the addressbook to print postal addresses
-	 on mailing labels.  Future versions of
-	 <application>Evolution</application> will allow you to you
-	 export a group of cards to a spreadsheet, database, or word
-	 processor so you can print address labels or prepare large
-	 mailings.
-      </para>
-  <para>
-    Need a map or directions? Click <guibutton>MapIt</guibutton> from
-  within the addressbook, and <application>Evolution</application>
-  will map the address for you online.
-  </para>
-  -->
-</chapter> 
-
-
-
diff --git a/help/C/usage-exchange.xml b/help/C/usage-exchange.xml
deleted file mode 100644
index 2d5ed3104b..0000000000
--- a/help/C/usage-exchange.xml
+++ /dev/null
@@ -1,956 +0,0 @@
- <chapter id="usage-exchange">
-    <title>The Ximian Connector for Microsoft Exchange</title>
-    <para>
-    The Ximian Connector for Microsoft Exchange allows Ximian
-    Evolution clients to access accounts on Microsoft Exchange 2000
-    servers. It is available through Ximian Red Carpet in its own
-    channel, but cannot be used without a license file.  The license
-    file may be purchased from the Ximian online store at <ulink
-    url="http://store.ximian.com">store.ximian.com</ulink>. Unlike the
-    regular Ximian Evolution client, the Ximian Connector for
-    Microsoft Exchange is proprietary software and source code is not
-    available.
-    </para>
-   
-  <warning id="licensing">
-    <title>Requirements</title>
-    <para>
-      Ximian Connector works only with Exchange 2000, and requires
-      that Outlook Web Access be enabled. Each user will need a
-      valid Microsoft Exchange 2000 server account, including license.
-  </para>
-  </warning>
-
-  <sect1 id="new-in-connector">
-<title>What's New in Connector &appversion;</title>
-  <para>
-    Ximian Connector &appversion; has added the <guilabel>Out of
-    Office</guilabel> feature and an automatic configuration tool for
-    large Exchange deployments.
-  </para>
-
-  <para>
-    Previous versions of Ximian Connector for Microsoft Exchange added
-    support for the <guibutton>Flag for Followup</guibutton> feature,
-    public folders, delegation, direct booking, and more. For
-    information on setting up delegation, see <xref
-  linkend="exchange-delegate" />.
-  </para>
-
-</sect1>
-
-  <sect1 id="features">
-    <title>Connector Features</title>
-    <para>
-      In addition to the features listed above, <application>Ximian
-      Connector</application> supports the following basic 
-      <application>Microsoft Exchange</application> features:
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    General
-	  </para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>Remote <application>Exchange</application> Information Store</term>
-	      <listitem>
-		<para>
-		  Allows you to access mail, address book (including
-		  Global Address List folder), and calendars, and task
-		  folders on an Exchange 2000 server from Evolution.
-		</para>
-	      </listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term>Palm synchronization</term>
-	      <listitem>
-		<para>
-		  Supported for Contacts and Calendars on Exchange.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</listitem>
-	<listitem>
-	  <para>
-	    Mail
-	  </para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>Viewing Mail in Exchange Folder</term>
-	      <listitem>
-		<para></para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>Sending Email via Exchange Protocols</term>
-	      <listitem>
-		<para>
-		  You may use the Microsoft Exchange mail transport
-		  protocol to send email. Make sure that the address
-		  you have entered as your email address is exactly
-		  the one that the Exchange server has on file. This
-		  may be "yourname@exchange-server.ximian.com" rather
-		  than "yourname@ximian.com."
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</listitem>
-	<listitem>
-	  <para>
-	    Calendar
-	  </para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>Meeting Request/Proposal</term>
-	      <listitem>
-		<para>
-		  Allows Evolution users to
-		  schedule meetings and view attendee availability for
-		  other users (Evolution  or
-		  Outlook  users) on
-		  Exchange.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>Adding iCalendar Meeting Requests to Calendar</term>
-	      <listitem>
-		<para>
-		  If you receive an iCalendar meeting request and add it
-		  to your calendar, it will be saved to your
-		  Exchange calendar.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</listitem>
-	<listitem>
-	  <para>
-	    Contacts
-	  </para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>Address Completion</term>
-	      <listitem>
-		<para>
-		  Supported for your Exchange
-		  Contacts folder.  Not yet supported for the Global
-		  Address List.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>Adding VCards to Address Book</term>
-	      <listitem>
-		<para>
-		  If you receive a VCard attachment and click
-		  <guibutton>Save in Address Book</guibutton>, it will
-		  be saved to your Exchange address book.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>New Address Book entries can be created on
-		Exchange from received email
-		messages with a single click</term>
-	      <listitem>
-		<para>
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	</listitem>
-</itemizedlist>
-</para>
-
-<para>
-There are, however, some features which are not available:
-<itemizedlist>
-	    <listitem>
-	      <para>
-		Work Offline (disconnected mode).
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-               "Recall Message" function.
-	      </para>
-	    </listitem>
-      </itemizedlist>
-    </para>
-  </sect1>
-  <sect1 id="install">
-    <title>Installing the Connector</title>
-    <para>
-       To install the Ximian Connector, run Ximian Red Carpet by
-       selecting <menuchoice><guimenu>System</guimenu><guimenuitem>Get
-       Software</guimenuitem></menuchoice>.  Subscribe to the Ximian
-       Connector for Microsoft Exchange channel, select the Ximian
-       Connector for Microsoft
-       Exchange2000, and click the
-       <guibutton>Install</guibutton> button.  You can also install
-       the Connector by downloading the individual packages from
-       ftp.ximian.com if you wish.
-   </para>
-   <para>
-       Once you have installed the software, you will also need to
-       install a license file.  The license file is the verification
-       that you have paid for a license to use the Ximian
-       Connector. You can get the license file from the the Ximian
-       online store at <ulink
-       url="http://store.ximian.com">store.ximian.com</ulink>.  You
-       will need a browser with strong (128-bit or greater) encryption
-       to access the store. When you purchase a Ximian Connector
-       license, the store will mail you the license file with
-       instructions for installation. Once installed, the license file
-       unlocks the Ximian Connector functionality and you may connect
-       to an Exchange server.
-    </para>
- </sect1>
-
-  <sect1 id="exchange-configure">
-    <title>Adding your Exchange Account in Ximian Evolution</title>
-    <para>
-      Once you have installed the Connector, you need to set up access
-      for your Exchange account on both the
-      Exchange server and within Evolution.
-    </para>
-
-       <sect2 id="config-server">
-       <title>Exchange Server Settings</title>
-        <para>
-	  Check with your system administrator to ensure that:
-	<itemizedlist>
-	  <listitem>
-	    <para> 
-	      You have a valid account on the Exchange server.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para> You are permitted to access the account with
-	      WebDAV. This is the default setting for the
-	      Exchange server, so unless
-	      your system administrator has specifically turned it
-	      off, no changes should be necessary.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-      
-      <para>
-	The Ximian website knowledge base, at <ulink type="http"
-	url="http://support.ximian.com">support.ximian.com</ulink>,
-	has additional information about checking to make sure that
-	your Exchange server will accept
-	connections from Ximian Evolution.
-      </para>
-    </sect2>
-    
-
-    <sect2 id="config-client">
-      <title>Standard Configuration Tool for Ximian Connector</title>
-      <para>
-	Once you know that your server is ready for you to connect,
-        you are ready to add your Exchange account to Ximian Connector.
-     </para>
-
-
-    <sect3 id="config-easy">
-      <title>Simple Configuration Tool for Ximian Connector</title>
-      <para>
-        Ximian Connector 1.4 comes with a simple account creation tool
-        for some installations. Other installations will require
-        the standard account tool described in <xref
-        linkend="config-client" /> below.
-      </para>
-      <para>
-        The simple assistant works in the following cases:
-        <itemizedlist>
-          <listitem>
-            <para>
-              If you receive your license key in Ximian Evolution, the
-              simple assistant will start when you click the
-              license file attachment and choose <guibutton>Open in
-            Ximian Connector</guibutton>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            If you have no accounts configured, and your system
-            administrator has preinstalled a license key file,            
-            the simple assistant will start when you start Ximian
-            Evolution. It asks only for the name of your Outlook
-            Web Access server, and your username and password. Ximian
-            Connector will determine the remaining information on its own.
-          </para>
-        </listitem>
-      </itemizedlist>
-    </para>
-      <para>
-        If the simple account tool does not run automatically, create
-        an account as described below.
-      </para>
-    </sect3>
-  
-
-      <sect3 id="config-exchange-new-account">
-	<title>Creating a New Exchange Account</title>
-
-	
-	<para>
-	  If you would like to create a new account for your Exchange
-          server, select <menuchoice>
-	  <guimenu>Tools</guimenu>
-	  <guimenuitem>Mail Settings</guimenuitem>
-	  </menuchoice>
-          from any mail view. Then click the <guibutton>Add</guibutton>
-          button in the accounts list. The account creation assistant
-          will guide you through the process, which is also described in
-          <xref linkend="usage-mainwindow-starting"/>. If you're not
-          sure about any of the information you need, just ask your
-          system administrator.
-        </para>
-
-     <note id="license-file-issues">
-       <title>Installing the License File</title>
-       <para>
-         Your purchase email will contain instructions for installing
-         the license file: it may be opened with Ximian Evolution and
-         installed automatically that way, or placed in the
-         <systemitem>evolution</systemitem> directory in your home
-         directory.
-       </para>
-       <para>
-         Be aware that the <systemitem>evolution</systemitem> directory in
-         your home directory won't exist if you haven't already run 
-         Ximian Evolution. If you have not
-         done so already, start Ximian
-         Evolution and configure an account as described
-         below.  Then, quit the application and place the
-         <systemitem>connector-key.data</systemitem> file in your
-         <systemitem>evolution</systemitem> directory. When you start
-         Evolution again, the license will
-         be verified and Ximian Connector will work properly.
-       </para>
-     </note>
-
-
-	<variablelist>
-	  <varlistentry>
-	    <term>Identity</term>
-	  <listitem>
-	      <para>Enter your name and email address. If you wish,
-	      you may add your organization and the location of your
-	      signature file. Only your name and email address are
-	      required.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Receiving Mail</term>
-	  <listitem>
-	      <para>
-                In this step, you'll enter information about the way
-                you check mail:
-                 <orderedlist>
-		  <listitem>
-		    <para>
-                      First, select <guilabel>Microsoft
-                      Exchange</guilabel> as your server type.
-                   </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-                     Enter the name of your Exchange email server, and
-                     the user name you would use to log in to a
-                     Windows workstation in your organization.
-                   </para>
-		  </listitem>
-		    <listitem>
-		    <para>
-                      If you wish, select the box labeled
-                      <guilabel>Use secure connection
-                      (SSL)</guilabel>, to take advantage of a more
-                      secure connection method. This may allow you to
-                      connect to the server from outside your
-                      firewall.
-                   </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-                       If you would like
-                       Evolution to
-                       remember your password, check the box labeled
-                       <guilabel>Remember this password</guilabel>.
-                     </para>
-		  </listitem>
-		</orderedlist>
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Receiving Mail, Step Two</term>
-	  <listitem>
-	      <para>There are a few additional options in this step:
-               <orderedlist>
-		  <listitem>
-		    <para>
-                       Checking for New Mail: If you would like to
-                       check for new mail automatically, click the
-                       checkbox and enter an interval in minutes.
-                     </para>
-		  </listitem>
-                  <listitem>
-                    <para>
-                      Global Address List/Active Directory: Enter the
-                      name of your global catalog server (directory
-                      server). This will allow you to use the Global
-                      Address List (GAL). Normally,
-                      Evolution will fetch
-                      a maximum of 500 responses to any query, but you
-                      may increase or decrease this number if you
-                      wish. A lower number decreases load on the
-                      server, and many servers will refuse to return
-                      more than 1000 results, no matter how many you
-                      ask for.
-                     </para>
-		  </listitem>
-
-		  <listitem>
-		    <para>
-                      Exchange Server: There are two options here:
-                      <itemizedlist>
-                        <listitem>
-                          <para>
-                            Exchange mailbox name is different
-                            from user name: If your exchange mailbox
-                            name is different from your user name,
-                            check this box and enter the mailbox name
-                            here.
-                          </para>
-                        </listitem>
-                        <listitem>
-                          <para>
-                            OWA path is not /exchange: In most cases,
-                            the URL for Outlook Web Access is
-                            "http://server.company.com/exchange." If your
-                            system has a path that is not "/exchange," check
-                            the box and enter the custom path here.
-                          </para>
-                        </listitem>
-                        <listitem>
-                          <para>
-                            Public Folder Location: If your Exchange
-                            system has a custom or nonstandard Public
-                            Folder location, check this box and enter
-                            the URL for public folders here.
-                          </para>
-                        </listitem>
-                      </itemizedlist>
-                    </para>
-                  </listitem>
-	          <listitem>
-		    <para>
-                      Apply filters to new messages in Inbox on this
-                      server: Check this box to filter messages in
-                      this account.
-                     </para>
-		  </listitem>
-		</orderedlist>
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Sending Mail</term>
-	  <listitem>
-	      <para>Select <guilabel>Microsoft Exchange</guilabel> as
-	      your email sending method. There is nothing else to do
-	      in this step.</para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Account Management</term>
-	  <listitem>
-	      <para>Enter a name that you will use to remember this
-	      account.  "Exchange Account" is a good suggestion. Note
-	      that you cannot have two accounts with the same name.
-	      If you'd like to make this your default account for
-	      sending email, check the <guilabel>Make this my default
-	      account</guilabel> box.</para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	<para>
-          You're done.  Click <guibutton>Finish</guibutton> and
-          <guibutton>OK</guibutton>, then quit
-          Evolution and start it again. Now
-          you're ready to get to work on the Exchange server.
-        </para>
-
-	<figure>
-        <title>Creating an Exchange Account, Step One: Identity</title>
-	<screenshot>
-	  <screeninfo>Creating an Exchange Account, Step One: Identity</screeninfo>
-	  <mediaobject><imageobject>
-	      <imagedata  format="PNG" fileref="figures/exchange-identity" srccredit="Aaron Weber"/>
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-
-	<figure>
-        <title>Creating an Exchange Account, Step Two: Receiving Mail</title>
-	<screenshot>
-	  <screeninfo>Creating an Exchange Account, Step Two: Receiving Mail</screeninfo>
-	  <mediaobject><imageobject>
-	      <imagedata  format="PNG" fileref="figures/exchange-receive" srccredit="Aaron Weber"/>
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-
-	<figure>
-        <title>Creating an Exchange Account, Step Three: Mail Options</title>
-	<screenshot>
-	  <screeninfo>Creating an Exchange Account, Step Three: Mail Options</screeninfo>
-	  <mediaobject><imageobject>
-	      <imagedata  format="PNG" fileref="figures/exchange-receive-options" srccredit="Aaron Weber"/>
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-
-
-      </sect3>
-
-      <sect3 id="config-exchange-existing-account">
-	<title>Changing an Existing Account to Work with Exchange</title>
-	  <para>
-	    If you have an existing email account, and want to convert it
-	    to use for Exchange, select the account you want to convert
-	    and click the <guibutton>Edit</guibutton> button. You'll want
-	    to change settings in the following tabs of the account
-	    dialog:
-	  </para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>Identity</term>
-	      <listitem>
-	      <para>
-		 If your email address will change because you are moving
-		 to a new server, then change it in this tab. Otherwise,
-		 move to the next tab.
-	      </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>Receiving Mail</term>
-	      <listitem>
-		<para>
-		  Select <guilabel>Microsoft Exchange</guilabel> as your
-		  server type. Enter your name of your server next to
-		  <guilabel>Host</guilabel>, and the user name for your
-		  account next to <guilabel>Username</guilabel>. If your
-		  server supports SSL (Secure Socket Layer) encryption, it
-		  you can check the <guilabel>Use SSL</guilabel> box to
-		  take advantage of more secure data transfers.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>Receiving Options</term>
-	      <listitem>
-		  <para>
-		    Here, tab, you'll find some additional settings:
-		    <variablelist>
-		     <varlistentry>
-		      <term>Checking for New Mail</term>
-		       <listitem>
-			 <para>
-			    Select whether you would like to check for
-			    mail automatically, and if so, how often.
-			 </para>
-		       </listitem>
-		    </varlistentry>
-		    <varlistentry>
-		      <term>Mailbox Name and Web Access Path</term>
-		       <listitem>
-			 <para>
-			   If your Exchange server requires you to use a
-			   different mailbox name from the name you use to
-			   log in, select the second check-box and enter
-			   the mailbox name.  Check with your system
-			   administrator to be sure.
-			 </para>
-	                 <para>
-			   In most cases, the URL for web access is
-			  "http://server.company.com/exchange." If your
-			  system has a path that is not "exchange," check
-			  the box and enter the custom path here.
-			 </para>
-		       </listitem>
-		    </varlistentry>
-		    <varlistentry>
-		      <term>Active Directory</term>
-		       <listitem>
-			 <para>
-			   If you would like to use the Global Address
-			   List (GAL) maintained on your Exchange server,
-			   click the tab labeled <guilabel>Receiving
-			   Options</guilabel> and check the box labeled
-			   <guilabel>Create a Global Address List
-			   folder</guilabel>.  The GAL is maintained by
-			   your system administrator and you cannot add,
-			   change, or remove items from it using Ximian
-			   Evolution. However, you can use it to invite
-			   people to meetings and to look up addresses and
-			   other information. In many organizations, the
-			   GAL is stored on a different server from email.
-			   If this is the case, you should also specify
-			   the directory server name here.
-			 </para>
-		       </listitem>
-		    </varlistentry>
-		  </variablelist>
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>Sending Mail</term>
-	      <listitem>
-		<para>
-		  If you will use your Exchange server to send as well as
-		  receive mail, select <guilabel>Microsoft
-		  Exchange</guilabel> as your server type, and enter the
-		  server name as the <guilabel>Host</guilabel>. 
-		</para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-	<para>
-
-        Once you have made those changes, click the
-        <guibutton>OK</guibutton> button.
-      </para>
-	<para>
-          Then, quit Evolution and start it
-          up again. Changes to the Ximian Connector accounts
-          configuration are not active until you have restarted the
-          application.
-       </para>
-      </sect3>      
-    </sect2>
-  </sect1>
-  
-  <sect1 id="access">
-    <title>Accessing the Exchange Server</title>
-    <para>
-      Like IMAP and LDAP data, information for
-      Exchange accounts is stored on the
-      server, not on your desktop computer.  This means that you can
-      access it from multiple locations. It also means that your
-      Microsoft Exchange account information
-      is in a separate folder tree from the <guilabel>Local</guilabel>
-      tree in your folder bar. You'll see it below the local tree,
-      with the name you gave the account. If you have multiple
-      accounts, you will have multiple folder trees.
-    </para>
-    <para>
-      Click on any of the folder tree items to visit them; you may
-      have to enter your server password.  You can now create contact
-      cards, send and receive email as you would normally. If there
-      are items in your local calendar or addressbook that you'd like
-      to add to your Exchange stores, you
-      can copy and paste them over, or just drag items from one folder
-      to another as you would with two local stores.
-    </para>
-
-      <note id="save-to-local-or-exchange">
-	<title>Saving Attached Addresses and Appointments</title>
-	<para>
-          If you are using both an Exchange account and a local mail
-          account, you should be aware that whenever you save an email
-          address or appointment from an email message, it will be
-          saved in your Exchange contacts list or calendar, rather
-          than in your local account. The same is true of
-          synchronization with Palm-OS devices: tasks, appointments,
-          and addresses from your Palm-OS device will be synchronized
-          with those in the Exchange folders rather than local
-          folders.
-       </para>
-      </note>
-
-   <tip id="gal-empty">
-	<title>The Global Address List Appears Empty At First</title>
-	<para>
-          To avoid unnecessary strain on the server, the GAL will
-          appear empty until you have searched for something in it.
-          If you want to display all the cards in the list, click in
-          the search box and press <keycap>Enter</keycap>.  This
-          enters a blank search: since every card contains a blank in
-          it, every card will appear.
-        </para>
-      </tip>
-
-    </sect1>
-
-    <sect1 id="exchange-settings">
-      <title>Special Connector Only Settings</title>
-      <para>
-        There are two items in the Evolution preferences window that
-        are available only with Ximian Connector. The first is
-        delegation and permissions handling, and the second is the
-        creation of "Out of Office" messages.
-      </para>
-
-      <sect2 id="exchange-delegate">
-        <title>Access Delegation</title>
-        <para>
-          You can allow other people in your organization's Global
-          Address List  to access your calendar, address
-          book, and messages, and they can let you manage theirs.
-          Delegation allows people to do anything from check on each
-          other's schedules to completely manage their personal
-          information.
-        </para>
-
-        <sect3 id="exchange-delegate-to-others">
-          <title>Delegating Access to Others</title>
-        <para>
-          To add someone to your list of delegates, click the
-          <guibutton>Add</guibutton> button and select them from the
-          Global Address List. When delegating you can grant different
-          levels of access to different types of data. You may also
-          decide whether the access you grant applies to items marked
-          <guilabel>Private</guilabel>, or only to public items.
-        </para>
-
-        <para>
-          For each of the four types of folder, you may select one of
-          the following levels of access:
-          <variablelist>
-            <varlistentry>
-              <term>None</term>
-              <listitem>
-                <para>
-                  Do not allow this person to access any folders of
-                  this type.
-                </para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term>Reviewer (read-only)</term>
-              <listitem>
-                <para>
-                  Allow the person to see items in this type of
-                  folder, but not create new items or edit existing
-                  items.
-                </para>
-              </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term>Author (read, create)</term>
-              <listitem>
-                <para>
-                  The delegate may view items in your folders, and may
-                  create new items, but may not change any existing items.
-                </para>
-              </listitem>
-            </varlistentry>
-        
-            <varlistentry>
-              <term>Editor (read, create, edit)</term>
-              <listitem>
-                <para>
-                  The delegate may view, create, and change items in
-                  your folders.
-                </para>
-              </listitem>
-            </varlistentry>
-          </variablelist>
-        </para>
-      </sect3>
-      <sect3 id="exchange-delegated-to-you">
-        <title>Acting as a Delegate for Others</title>
-        <para>
-          To see the list of people who have granted you access to
-          their folders, click the <guilabel>Acting as a
-          Delegate</guilabel> tab in the Exchange Delegation settings
-          window. If you plan to send email on behalf of someone,
-          click the checkbox next to their name, and an email identity
-          will be created. You can then select that identity in the
-          <guilabel>From</guilabel> list in your message composer.
-        </para>
-
-        <para>
-          To access the folders delegated to you, do the following:
-          <orderedlist>
-            <listitem>
-              <para>
-                Select 
-                <menuchoice>
-                  <guimenu>File</guimenu>
-                  <guimenuitem>Open Other User's Folder</guimenuitem>
-                </menuchoice>
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                Enter the email address of the user who
-                has delegated to you or click the
-                <guibutton>User</guibutton> button to select them from your
-                addressbook. 
-              </para>
-            </listitem>
-          
-            <listitem>
-              <para>
-                Select the folder you wish to open.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Click OK.
-              </para>
-            </listitem>
-          </orderedlist>
-        </para>
-        <para>
-          Folders delegated to you appear in your folder list inside a 
-          folder labeled with the name of their owner. For example, if
-          Martha Thompson delegates folders to you, you will see a
-          folder called <guilabel>Martha Thompson's Folders</guilabel>
-          in the folder tree at the same level as your <guilabel>Personal
-          Folders</guilabel> and <guilabel>Public
-          Folders</guilabel>. 
-        </para>
-
-        <note id="error">
-          <title>Error Messages</title>
-          <para>
-            If the folder fails to open properly, check with the
-            folder owner that you have been granted the correct access
-            permissions.
-          </para>
-        </note>
-      </sect3>
-    </sect2>
-
-      
-      <sect2 id="exchange-out-of-office">
-        <title>Setting an Out of Office Message</title>
-        <para>
-          An <guilabel>Out of Office</guilabel> message is
-          an automatic reply that you can send to emails, explaining why
-          you aren't going to respond to their message. For example, if
-          you go on vacation for a week and will be away from email, you
-          can set an automatic reply so that people who write to you know
-          that you aren't ignoring them.
-        </para>
-        <para>
-          To create an <guilabel>Out of Office</guilabel> message,
-        select <menuchoice> <guimenu>Tools</guimenu>
-        <guimenuitem>Settings</guimenuitem>
-          </menuchoice> and then click the <guibutton>Out of
-          Office</guibutton> button. 
-        </para>
-
-        <para>
-          Then, click  <guilabel>I am currently
-          out of the office.</guilabel>. Then, enter a short message in
-          the text entry box. Click <guilabel>OK</guilabel>.
-        </para>
-        <para>
-          Your message will be sent automatically to
-          anyone who sends you mail until you return and click
-          <guilabel>I am currently in the office</guilabel>.
-        </para>
-      </sect2>
-
-
-    </sect1>
-
-
-    <sect1 id="full-advantage">
-      <title>Scheduling Appointments with Free/Busy</title>
-      <para>
-        When you schedule a meeting with your calendar on the
-        Exchange server, you can check when
-        other local Exchange users are busy according to their
-        Exchange calendars. To do so:
-     </para>
-      <figure>
-        <title>Scheduling With Free/Busy Information</title>
-	<screenshot>
-	  <screeninfo>Using the Free/Busy Feature</screeninfo>
-	  <mediaobject><imageobject>
-	      <imagedata  format="PNG" fileref="figures/schedule" srccredit="Aaron Weber"/>
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-
-       <note id="reminders-in-exchange">
-         <title>Reminders In Exchange</title>
-         <para>
-          Reminders for appointments in your Exchange calendar will
-          not work until you have run Evolution at least once after
-          logging in. This is different from locally stored reminders,
-          which will work from the moment you log in, regardless of
-          whether you have run Evolution in the session.
-         </para>
-        </note>
-      <orderedlist numeration="arabic">
-	<listitem>
-	  <para>
-            Open a new appointment in the calendar.
-          </para>
-	</listitem>
-	<listitem>
-	  <para> Choose <menuchoice> <guimenu>Actions</guimenu>
-	      <guimenuitem>Schedule Meeting</guimenuitem>
-	      </menuchoice> in the meeting editor window.
-          </para>
-	</listitem>
-	<listitem>
-	  <para> Add attendees, either by entering their email
-            addresses into the list, or by clicking the
-            <guibutton>Invite Others</guibutton> button. If you choose
-            to so, it's best to use the Global Address List (GAL).
-            Choose the GAL from the drop-down list of address sources
-            at the top of the dialog box.
-         </para>
-	</listitem>
-	<listitem>
-	  <para>
-          Choose <guilabel>Options</guilabel> and then
-          <guilabel>Update Free/Busy</guilabel> to check participant
-          schedules and, if possible, update the meeting in all
-          participants' calendars.
-         </para>
- 	</listitem>
-      </orderedlist>
-      <tip id="autopick">
-	<title>Using Autopick to Adjust Meeting Times</title>
-	<para>
-         If meeting attendees are not available during the times you
-         have scheduled a meeting, you can "nudge" the meeting forward
-         or backward to the nearest available time.  To do so, just
-         click the arrows to the left or right of the
-         <guilabel>Autopick</guilabel> button. The Autopick tool will
-         move the meeting to the nearest time during which all
-         attendees are available.  If you aren't satisfied with those
-         results, you can drag the edges of the meeting time to the
-         hours that you want to select.
-      </para>
-      </tip>
-    </sect1>
-</chapter>
-
diff --git a/help/C/usage-exec-summary.xml b/help/C/usage-exec-summary.xml
deleted file mode 100644
index 69eab4f91c..0000000000
--- a/help/C/usage-exec-summary.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-
-<chapter id="usage-summary">
-  <title>Getting Oriented with the Ximian Evolution Summary</title>
-  
-  <sect1 id="summary-intro">
-    <title>Using the Summary</title>
-    <para>
-      The Ximian Evolution Summary can show you what you need to know
-      quickly.  It will show you your tasks for that day, how many
-      emails are waiting for you, and much more.
-    </para>
-    <para>
-      To begin using your Summary, click on the <guilabel>Shortcut
-      Bar</guilabel> or <guilabel>Summary</guilabel> at the top of the
-      <guilabel>Folder Bar</guilabel>.  By default, you will see:
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    Weather Reports
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    News feeds from the Internet
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Mail summary
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Appointments
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Tasks
-	  </para>
-	</listitem>
-      </itemizedlist>
-    </para>
-  </sect1>
-  <sect1 id="customizing-summary">
-    <title>Customizing the Summary's Modules</title>
-    <para>
-      <application>Evolution's</application> modules can be customized
-      to suit your needs.  For example, you can choose which mail
-      boxes are summarized, and which news services appear.
-    </para>
-
-
-  <note id="summary-http-proxy">
-    <title>Using the Summary through an HTTP Proxy</title>
-    <para>
-      If you use an HTTP proxy, <application>Ximian
-    Evolution</application> must be able to find it through the
-    <systemitem>gnome-vfs</systemitem> subsystem before it can
-    access news and weather from the Internet.  This is also
-    the case if you wish to load remote images into HTML mail
-    message.  
-  </para>
-  <para>
-    You can find the proxy settings tool in the Control Center.
-  </para>
-</note>
-
-
-    <sect2 id="customizing-summary-weather">
-      <title>Customizing the Weather Summary</title>
-      <para>
-	To add a city to be displayed in the weather:
-	<orderedlist numeration="arabic">
-	  
-	  <listitem>
-	    <para>
-	      Choose
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Settings</guimenuitem> </menuchoice> and
-		select the <guilabel>Summary Preferences</guilabel> tool.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the <guilabel>Weather</guilabel> tab.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the city on the left hand column.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Add</guibutton> button.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-        Below the list of cities, you can select the time, in seconds,
-        between updates, and whether you wish to see temperatures in Celsius
-        or Farenheit.
-      </para>
-
-    </sect2>
-    <sect2 id="customizing-feeds">
-      <title>Customizing Your News Feeds</title>
-      <para>
-	To customize your news feeds:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Choose
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Settings</guimenuitem> </menuchoice> and
-		select the <guilabel>Summary Preferences</guilabel> tool. Then, choose the
-		<guilabel>News Feeds</guilabel> tab.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      In the left hand column, select the news feed to add to
-	      your display.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Add</guibutton> button.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>OK</guibutton>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-        You can also add your own news feeds. Evolution will display
-        RDF formatted XML news feeds from the website of your
-        choice. For most sites, it's a file called "index.rdf."
-      </para>
-
-    </sect2>
-    <sect2 id="customizing-mail">
-      <title>Customizing Your Mail Summary</title>
-      <para>
-	To customize your mail summary:
-	<orderedlist numeration="arabic">
-        <listitem>
-	    <para>
-	      Choose
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Settings</guimenuitem> </menuchoice> and
-		select the <guilabel>Summary Preferences</guilabel> tool.
-	    </para>
-	  </listitem>	
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Mail</guibutton> tab.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-              Expand the folder tree to the folders you wish to
-              display in the Summary.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the checkbox to the left of that folder.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-    <sect2 id="customizing-cal">
-      <title>Customizing Your Schedule Summary</title>
-      <para>
-	To customize your calendar summary:
-	<orderedlist numeration="arabic">
-	 <listitem>
-	    <para>
-	      Choose
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Settings</guimenuitem> </menuchoice> and
-		select the <guilabel>Summary Preferences</guilabel> tool.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Schedule</guibutton> tab.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Choose whether you'd like appointments displayed for one
-	      day, five days, a week, or a month.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-            Choose whether you'd like to display all tasks, or just
-            the tasks due today.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-  </sect1>
-</chapter>
\ No newline at end of file
diff --git a/help/C/usage-mail-org.xml b/help/C/usage-mail-org.xml
deleted file mode 100644
index f279058e45..0000000000
--- a/help/C/usage-mail-org.xml
+++ /dev/null
@@ -1,1289 +0,0 @@
-<chapter id="usage-mail-organize">
-    <title>Organizing and Managing your Email</title>
-    <para>
-      Even if you only get a few email messages a day, you probably
-      want to sort and organize them.  When you get a hundred a day
-      and you want to refer to a message you received six weeks ago,
-      you <emphasis>need</emphasis> to sort and organize them.
-      Fortunately, <application>Ximian Evolution</application> has the tools
-      to help you do it.
-    </para>
-
-  <sect1 id="importing-mail-and-settings">
-    <title>Importing Your Old Email and Settings</title>
-    <para>
-      <application>Evolution</application> allows you to import old
-      email and data so that you don't need to worry about losing your
-      old information.
-    </para>
-    <sect2 id="importing-mail">
-      <title>Importing Email and Other Data</title>
-      <para>
-        <application>Ximian Evolution</application> can import the
-        following types of files:
-        <variablelist>
-          <varlistentry>
-            <term>VCard (.vcf, gcrd):</term>
-            <listitem>
-              <para>
-                The addressbook format used by the GNOME, KDE, and
-                many other contact management applications. You
-                should be able to export to VCard format from any
-                address book application.
-              </para>
-            </listitem>
-          </varlistentry>
-
-	  <varlistentry>
-	    <term>iCalendar (.ics):</term>
-	    <listitem>
-	      <para>
-		A format for storing calendar files.  iCalendar is used by 
-		PalmOS based handhelds, Ximian
-                <application>Evolution</application>, and Microsoft
-		<application>Outlook</application>.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-            <term>Microsoft Outlook Express 4 (.mbx):</term>
-            <listitem>
-              <para>
-                Email file format used by Microsoft Outlook Express
-                4. For other versions of Microsoft Outlook and Outlook Express, see
-                the workaround described in the note below.
-              </para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>LDAP Data Interchange Format (LDIF):</term>
-            <listitem>
-              <para>
-                A standard data format for address book cards.
-              </para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>MBox (mbox):</term>
-            <listitem>
-              <para>
-                The email box format used by Mozilla, Netscape,
-                Ximian Evolution, Eudora, and many other email clients.
-              </para>
-            </listitem>
-          </varlistentry>
-        </variablelist>
-      </para>
-      <para>
-        To import your old email:
-        <orderedlist numeration="arabic">
-          <listitem>
-            <para>
-              Click <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice>.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Click <guibutton>Next</guibutton> after reading the Welcome screen.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Select <guibutton>Import a single file</guibutton>.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Find the file that you wish to import into <application>Evolution</application>.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Click <guibutton>Import</guibutton>
-            </para>
-          </listitem>
-        </orderedlist>
-      </para>
-    </sect2>
-    <sect2 id="importing-preferences">
-      <title>Importing Preferences</title>
-      <para>
-        <application>Evolution</application> can import all your old
-        mail, contacts, and other information from other applications,
-        making your transition to <application>Evolution</application>
-        easy.
-      </para>
-      <para>
-        To import your old information:
-        <orderedlist numeration="arabic">
-          <listitem>
-            <para>
-              Click <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice>.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Click <guibutton>Next</guibutton> after reading the Welcome screen.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Select <guibutton>Import data and settings from older programs</guibutton>.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              The left-most column shows the application which your
-              information will be imported from.  You then select
-              checkboxes on each component to import different
-              properties of each application.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Click <guibutton>Next</guibutton>
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Click <guibutton>Import</guibutton>
-            </para>
-          </listitem>
-        </orderedlist>
-      </para>
-
-      <para>
-	<note>
-	  <title>Microsoft Outlook and Outlook Express Users</title>
-	  <para>
-	    Microsoft Outlook, and versions of Outlook Express after
-	    version 4, use proprietary formats that <application>Ximian
-	      Evolution</application> cannot read or import.  For contacts,
-	    you may have to email them to yourself and import them that
-	    way.  For email, there is a simpler workaround:
-	    <orderedlist numeration="arabic">
-	      
-	      <listitem>
-		<para>
-		  While using Windows, import the files into Mozilla Mail (or
-		  another mailer, such as Netscape or Eudora, that uses the
-		  standard mbox format).
-		</para>
-	      </listitem>
-	      
-	      <listitem>
-		<para>
-		  Copy the files to the system or partition you use for
-		  <application>Ximian Evolution</application>.  
-		</para>
-	      </listitem>
-	      
-	      <listitem>
-		<para>
-		  Use the <application>Ximian Evolution</application> import
-		  tool to import the files.  There's more information about
-		  why this works, and how, at the Ximian support website.
-		</para>
-	      </listitem>
-	    </orderedlist>
-	  </para>
-	</note>     
-	
-	<note>
-	  <title>Netscape Users</title>
-	  <para>
-	    Before importing mail from Netscape, make sure you select
-	    <menuchoice><guimenu>File</guimenu><guimenuitem>Compact All
-		Folders</guimenuitem></menuchoice>. If you don't,
-	    <application>Ximian Evolution</application> will import and undelete
-	    the messages in your Trash folders.
-	  </para>
-	</note>     
-	
-      </para>
-      
-    </sect2>
-  </sect1>
-  <sect1 id="usage-mail-organize-columns">
-    <title>Sorting Mail with Column Headers</title>
-    <para>
-      By default, the message list has columns with the following
-      headings: an envelope icon indicating whether you have read
-      or replied to a message, an exclamation point indicating priority, and the
-      <guilabel>From</guilabel>, <guilabel>Subject</guilabel>, and
-      <guilabel>Date</guilabel> fields. You can change their order
-      and remove them by dragging and dropping them.  
-      
-      To add columns:
-      <orderedlist numeration="arabic">
-	<listitem>
-	  <para>
-	    Right click on the column header
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Click <guimenuitem>Add a Column</guimenuitem>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Click and drag a column you want into a space between
-	    existing column headers.  A red arrow will show you where
-	    the column will be placed.
-	  </para>
-	</listitem>
-      </orderedlist>
-      </para>
-      <para>
-	Right-click on one of the column headers to get a list of
-	options:
-	<variablelist>	  
-	<varlistentry>
-	  <term><guimenuitem>Sort Ascending</guimenuitem>:</term>
-	  <listitem><para>
-	      Sorts the messages top to bottom.
-	    </para></listitem>
-	</varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Sort Descending</guimenuitem>:</term>
-	    <listitem><para>
-		Sorts the messages bottom to top.
-	      </para></listitem>
-	  </varlistentry>
-	  
-	<varlistentry>
-	  <term><guimenuitem>Remove this
-	      Column</guimenuitem>:</term> 
-	  <listitem>
-	    <para>
-	      Remove this column from the display. You can also remove
-	      columns by dragging the header off the list and
-	      letting it drop.  
-	    </para>
-	  </listitem>
-	</varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Customize Current
-	      View</guimenuitem>:</term> <listitem><para> Choose this
-	      item to pick a more complex sort order for messages, or
-	      to choose which columns of information about your
-	      messages you wish to display
-            </para></listitem>
-	</varlistentry>
-	</variablelist>
-      </para>
-
-      <sect2 id="usage-mail-organize-columns-followup">
-        <title>Column Sorting with the Follow Up Feature</title>
-        <para>
-          One way to make sure you don't forget about a message is
-          with the <guilabel>Follow Up</guilabel> feature. To use it,
-        select one or more messages, and then right-click on one and select
-        <guimenuitem>Follow Up</guimenuitem>.  A dialog box will open
-        and allow you to set the type of flag and the due date.
-      </para>
-      <para>
-        The <guilabel>Flag</guilabel> itself is the action you
-        want to remind yourself about. Several are provided for you, such as
-        <guilabel>Call</guilabel>, <guilabel>Forward</guilabel>, and
-        <guilabel>Reply</guilabel>, but you can enter your own note or
-        action if you wish. You may set a deadline date for the flag
-        as well, if you wish.
-      </para>
-      <para>
-        Once you have added a flag, you can mark it as complete or
-        remove it entirely by right-clicking on the message and
-        selecting <guilabel>Flag Completed</guilabel> or <guilabel>Clear
-        Flag</guilabel>.
-      </para>
-
-      <para>
-         When you read a flagged message, its flag status will be
-         displayed right at the top, before the message headers. An
-        overdue message might tell you <guilabel>Overdue: Call by April 07, 2003, 5:00 PM</guilabel>
-      </para>
-
-      <para>
-        Flags can help you organize your work in a number of ways. For
-        example, you might add a Flag Status column to your message
-        list and sort that way. Alternately, you could create a vFolder
-        that displays all your flagged messages, and clear the flags
-        when you're done, so the vFolder contains only messages with
-        upcoming deadlines.
-      </para>
-
-      </sect2>
-
-    </sect1>
-
-    <sect1 id="usage-mail-organize-folders">
-      <title>Getting Organized with Folders</title>
-      <para>
-	<application>Ximian Evolution</application> keeps mail, as well as
-	address cards and calendars, in folders.  You start out with a
-	few mail folders, such as <guilabel>Inbox</guilabel>,
-	<guilabel>Outbox</guilabel>, and <guilabel>Drafts</guilabel>,
-	but you can create as many as you like.  Create new folders by
-	selecting <guisubmenu>New</guisubmenu> and then
-	<guimenuitem>Folder</guimenuitem> from the
-	<guimenu>File</guimenu> menu.
-	<application>Ximian Evolution</application> will as you for the name
-	and the type of the folder, and will provide you with a folder
-	tree so you can pick where it goes.
-      </para>
-      <para>
-        When you click <guibutton>OK</guibutton>, your new folder will
-	appear in the <interface>folder view</interface>.  You can
-	then put messages in it by dragging and dropping them, or by
-	using the <guibutton>Move</guibutton> button in the
-	toolbar. If you want to move several messages at once, click
-	on the ones you want to move while holding down the
-	<keycap>Ctrl</keycap> key, or use <keycap>Shift</keycap> to
-	select a range of messages.  If you create a filter with the
-	<interface>filter assistant</interface>, you can have mail
-	filed automatically.
-      </para>
-
-      <warning id="imap-subfolders">
-        <title>Subfolders in IMAP</title>
-        <para>
-          The INBOX folder on most IMAP servers cannot contain both
-          subfolders and messages. When you create additional folders
-          on your IMAP mail server, branch them from the root of the
-          IMAP account's folder, tree, not from INBOX. If you create
-          subfolders in your INBOX folder, you will lose the ability
-          to read messages that exist in your INBOX until you move the
-          folders out of the way.
-        </para>
-      </warning>
-
-  </sect1>    
-
-  <sect1 id="usage-mail-organize-search">
-    <title>Searching for Messages</title>
-    <para>
-      Most mail clients can search through your messages for you,
-      but <application>Ximian Evolution</application> does it faster. You
-      can search through just the message subjects, just the message
-      body, or both body and subject.
-    </para>
-    <para>
-      To start searching, enter a word or phrase in the text area
-      right below the toolbar, and choose a search type:
-      <variablelist>
-	<varlistentry>
-	  <term><guilabel>Body or subject contains</guilabel>:</term>
-	  <listitem>
-	    <para>
-	      This will search message subjects and the messages
-	      themselves for the word or phrase you've entered in
-	      the search field.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term> <guilabel>Body contains</guilabel>:</term>
-	  <listitem>
-	    <para>
-	      This will search only in message text, not the subject
-	      lines.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Subject contains:</guilabel></term>
-	  <listitem>
-	    <para>
-	      This will show you messages where the search text is
-	      in the subject line.  It will not search in the
-	      message body.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Body does not contain:</guilabel></term>
-	  <listitem>
-	    <para>
-	      This finds every email message that does not have the
-	      search text in the message body.  It will still show
-	      messages that have the search text in the subject
-	      line, if it is not also in the body.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Subject does not contain:</guilabel></term>
-	  <listitem>
-	    <para>
-	      This finds every mail whose subject does not contain
-	      the search text.
-	    </para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-      
-      When you've entered your search phrase, press
-      <keycap>Enter</keycap>.  <application>Ximian Evolution</application>
-      will show your search results in the message list.
-    </para>
-    
-    <para>
-      If you think you'll want to return to a search again, you can
-      save it and execute it later. Just click <guilabel> Save
-      Search</guilabel> from the <guimenu>Search</guimenu> menu. Then,
-      you can run that search on any folder by selecting it from the
-      <guimenu>Search</guimenu> menu. You may also want to create a
-      vFolder instead; see <xref
-      linkend="usage-mail-organize-vfolders" /> for more detail.
-    </para>
-
-      <para>
-         When you're done with the search, go back to seeing all your
-         messages by choosing <guimenuitem>Show All</guimenuitem> from
-         the <guilabel>Search</guilabel> drop-down box, or enter a
-         blank search.
-      </para>
-
-      <para>
-        If you'd like to perform a more complex search, open the
-        advanced search dialog by selecting
-        <guilabel>Advanced...</guilabel> from the
-        <guilabel>Search</guilabel> drop-down menu.  Then, create your
-        search criteria (each with the same options you saw in the
-        regular search bar), and decide whether you want to find
-        messages that match all of them, or messages that match even
-        one. Then, click <guibutton>Search</guibutton> to go and find
-        those messages.
-     </para>
-
-     <para>
-        You'll see a similar approach to sorting messages when you
-        create filters and vFolders in the next few sections.
-     </para>
-
-    </sect1>
-
-    <sect1 id="usage-mail-organize-filters">
-      <title>Create Rules to Automatically Organize Mail</title>
-      <para>
-	Filters work very much like the mail room in a large company.
-	Their purpose is to bundle, sort, and distribute mail to the
-	various folders.  In addition, you can have multiple filters
-	performing multiple actions that may effect the same message
-	in several ways.  For example, your filters could put copies
-	of one message into multiple folders, or keep a copy and send
-	one to another person as well, and it can do that quickly. Of
-	course, it's also faster and more flexible than an actual
-	person with a pile of envelopes.
-      </para>
-
-      
-	  <tip id="easy-filter">
-	      <title>Quick Filter Creation</title>
-	      <para>
-		There is an easy shortcut for fast filter or vFolder
-                creation. Right-click on the message in the message
-                list, and select one of the items under the
-                <guimenuitem>Create Rule from Message</guimenuitem>
-                submenu.
-	      </para>
-	    </tip>
-
-    <sect2 id="usage-mail-org-filters-new">
-      <title>Making New Filters</title>
-      <para>
-	To create a new filter:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Click 
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Filters</guimenuitem>
-	      </menuchoice>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press the <guibutton>Add</guibutton> button.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Name your filter in the <guilabel>Rule name</guilabel> field.
-	      For each filter criterion, you must first select 
-	      which of the following parts of the message you want the filter to 
-	      examine:
-	      
-	      <itemizedlist>
-		<listitem><para>
-		    Sender - The sender's address.
-		  </para></listitem>
-		
-		
-		<listitem><para>
-		    Recipients - The recipients of the message.
-		  </para></listitem>
-	  
-		<listitem><para>
-		    Subject - The subject line of the message.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Specific Header - The filter can look at any header you
-		    want, even obscure or custom ones. Enter the header name
-		    in the first text box, and put your search text in the
-		    second one.
-        
-
-      <note id="multiple-repeated-headers">
-        <title>Repeated Headers</title>
-         <para>
-            If a message uses a header more than once, Evolution will
-	    pay attention only to the first instance, even if the
-	    message defines the header differently the second
-	    time. For example, if a message declares the Resent-From:
-	    header as "engineering@rupertcorp.com" and then restates
-	    it as "marketing@rupertcorp.com," Evolution will filter as
-	    though the second declaration had not occurred.  To filter
-	    on messages that use headers multiple times, use a regular
-	    expression.
-         </para>
-      </note>
-
-		  </para></listitem>
-		
-		<listitem><para>
-		    Message Body - Search in the actual text of the message.
-		  </para></listitem>
-		
-		<listitem>
-		  <para>
-		    Expression - For programmers only: match a message according to an
-		    expression you write in the Scheme language, used to
-		    define filters in <application>Ximian Evolution</application>.
-		  </para>
-
-<para>
-
-      <note id="lots-of-filters">
-        <title>What if Multiple Filters Match One Message?</title>
-         <para>
-            If you have several filters that match a single message,
-            they will all be applied to the message, in order, unless
-            one of the filters has the action <guibutton>Stop
-            Processing</guibutton>. If you use that action in a
-            filter, the messages that it affects will not be touched
-            by other filters.
-         </para>
-         <para>
-           When you first open the filters dialog, you are shown the
-           list of filters sorted in the order in which they will be
-           applied. You can move them up and down in the priority list
-           by clicking the <guibutton>Up</guibutton> and
-           <guibutton>Down</guibutton> buttons.
-         </para>
-      </note>
-</para>
-		</listitem>
-	
-
-	
-		<listitem><para> Date sent - Filter messages according to the date on
-		    which they were sent: First, choose the conditions you
-		    want a message to meet -- <guilabel>before</guilabel>
-		    a given time, <guilabel>after</guilabel> it, and so forth.
-		    Then, choose the time. The filter will compare the
-		    message's time-stamp to the system clock when the filter
-		    is run, or to a specific time and date you choose from a
-		    calendar.  You can even have it look for messages within a
-		    range of time relative to the filter -- perhaps you're
-		    looking for messages less than two days old.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Date Received - This works the same way as the <guilabel>Date Sent</guilabel> 
-		    option, except that it compares the time you got the message 
-		    with the dates you specify.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Score - Emails have a standard priority range from -3 (least
-		    important) to 3 (most important). You can have filters set the
-		    priority of messages you receive, and then have other filters 
-		    applied only to those messages which have a certain priority.
-		  </para></listitem>
-		
-		<listitem>
-		  <para>
-		    Size (kb) - Sorts based on the size of the message in kilobytes.
-		  </para>
-		</listitem>
-
-		<listitem>
-		  <para>
-		    Status - Filters according to the status of a message, such as
-		    'New'.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Attachments - Create a filter based on whether or not you 
-		    have an attachment in the email.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Mailing List - Filter based on the mailing list it came from.
-		  </para>
-		  <note>
-		    <title>How Does Filtering on Mailing Lists Work?</title>
-		    <para>
-		      Filtering on mailing list actually looks for a
-		      specific mailing-list header called the
-		      <computeroutput>X-BeenThere</computeroutput>
-		      header, used to identify mailing lists or other
-		      redistributors of mail.
-		    </para>
-		  </note>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Expression - If you know your way around a
-		    <glossterm
-		    linkend="regular-expression">regex</glossterm>, or
-		    regular expression, put your knowledge to use
-		    here. This allows you to search for complex
-		    patterns of letters, so that you can find, for
-		    example, all words that start with a and ends with
-		    m, and are between six and fifteen letters long,
-		    or all messages that declare a particular header
-		    twice. For information about how to use regular
-		    expressions, check the manual page for the
-		    <command>grep</command> command.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Source Account - Filter messages according the server you got them from.
-		    You can enter a URL or choose one from the drop-down
-		    list.  This ability is only relevant if you use more
-		    than one mail source.
-		  </para>
-		</listitem>
-	      </itemizedlist>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the criterion for the condition.   If you want multiple
-	      criteria for this filter, press <guibutton>Add
-		criterion</guibutton> and repeat the previous step.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the actions for the filter in the <guilabel>Then</guilabel>
-	      section.  You can select any of the following options.
-	      <itemizedlist>
-		<listitem><para>
-		    Move to Folder - If you select this item, <application>Ximian Evolution</application>
-		    will put the messages into a folder you specify.  Click the 
-		    <guibutton>&lt;click here to select a folder&gt;</guibutton> button
-		    to select a folder. 
-		  </para></listitem>
-
-		<listitem><para>
-		    Copy to Folder - If you select this item, <application>Ximian Evolution</application>
-		    will put the messages into a folder you specify.  Click the 
-		    <guibutton>&lt;click here to select a folder&gt;</guibutton> button
-		    to select a folder. 
-		  </para></listitem>
-		
-		<listitem><para>
-		    Forward to Address - Select this, enter an address, and the addressee will
-		    get a copy of the message.
-		  </para></listitem>
-
-		<listitem><para>
-		    Delete - Marks the message for deletion.  You can still get the message
-		    back, at least until you <guimenuitem>Expunge</guimenuitem> your
-		    mail yourself.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Stop Processing - Select this if you want to tell all other filters to ignore 
-		    this message, because whatever you've done with it so far
-		    is plenty.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Assign Color - Select this item, and <application>Ximian Evolution</application>
-		    will mark the message with whatever color you please.
-		  </para></listitem>
-		
-		<listitem><para> 
-		    Assign Score - If you know that all mail with
-		    "important" somewhere in the message body line is
-		    important, you can give it a high priority score. In a subsequent filter you can 
-		    then arrange your messages by their priority score.
-		  </para></listitem>
-	      </itemizedlist>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Set Status - If you want to add multiple actions for this filter, press
-	      <guibutton>Add action</guibutton> and repeat the previous step.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press <guibutton>OK</guibutton>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      
-      <note id="when-filters-go-wrong">
-        <title>When Are Filters Applied?</title>
-         <para>
-           If you use Ximian Connector to store your mail on an
-           Exchange server, filters are not applied until you open
-           your INBOX folder and select
-           <menuchoice><guimenu>Actions</guimenu><guimenuitem>Apply
-           Filters</guimenuitem></menuchoice> or press
-           <keycombo><keycap>Ctrl</keycap><keycap>Y</keycap></keycombo>
-         </para>
-      </note>
-
-      <example id="filter-example">
-         <title>Using a Filter to Avoid Spam</title>
-         <para>
-           Spam, also known as unsolicited commercial email (UCE), is
-           the bane of many people's Inboxes, but it doesn't have to
-           be. Using Ximian Evolution filters and an external Spam
-           detection tool like SpamAssassin (<ulink
-           url="http://spamassassin.org/">http://spamassassin.org/</ulink>),
-           you can catch the vast majority of junk mail and drop it
-           directly into the trash.
-         </para>
-         <para>
-           The easiest way to do this is to get your system
-           administrator to install SpamAssassin (or its equivalent)
-           on your mail server. There, it will flag messages it
-           suspects of being Spam with the "X-Spam-Status" header to
-           your mail, which you can then search for in a
-           filter. Because SpamAssassin scores mails based on the
-           likelihood that messages are junk, you can even choose how
-           strict you want it to be. If you don't have a friendly
-           network administrator, never fear: you can install
-           SpamAssassin on your own system, then pipe messages through
-           it before reading them.
-         </para>
-
-         <para>
-           If your system administrator or ISP has SpamAssassin, here's how to siphon off the junk mail:
-            <orderedlist>
-
-             <listitem><para>
-                 Select <menuchoice><guimenu>Tools</guimenu><guimenuitem>Filters</guimenuitem></menuchoice>.
-             </para></listitem>
-
-             <listitem><para>
-                 Click <guibutton>Add</guibutton>.
-             </para></listitem>
-
-             <listitem><para>
-               Set the first part of your search criterion to look in a <guilabel>Specific header</guilabel>.
-             </para></listitem>
-
-             <listitem><para>
-               Enter <userinput>X-Spam-Flag</userinput> as the name of the header.
-             </para></listitem>
-
-             <listitem><para>
-               Choose <guilabel>contains</guilabel> at the second drop-down box.
-             </para></listitem>
-
-             <listitem><para>
-               Enter <userinput>YES</userinput> as the content to search for. 
-               You're now working with all email that has the word "YES" in the 
-               "X-Spam-Status" header.
-             </para></listitem>
-
-             <listitem><para>
-               For actions, choose what you'd like to do with the
-             messages. You can delete the messages automatically, but
-             it's more prudent to place them in a "Possible Junk Mail"
-             folder, and check them over just to make sure a genuine
-             message didn't get flagged by accident.
-             </para></listitem>
-
-             <listitem><para>
-                Click OK. You're done.
-             </para></listitem>
-	   </orderedlist>
-         </para>
-         <para>
-           If you don't have SpamAssassin or other junk mail filtering
-           on your mail server, there's still hope, although it's not
-           quite as simple. First, download
-           and install SpamAssassin from <ulink
-           url="http://spamassassin.org">http://spamassassin.org</ulink>
-         You'll need to download the "spamassassin"
-         and "perl-Mail-SpamAssassin"
-         packages, and you can install them with Red Carpet by
-         selecting <guimenuitem>Install Local Packages</guimenuitem>
-         from the
-         <guimenu>File</guimenu> menu. Further instructions are at the
-         SpamAssassin web site. Once you have the software
-         installed, do the following: 
-
-         <orderedlist>
-           <listitem>
-           <para>
-             Open a new create a text file with any text editor (
-             <menuchoice>
-               <guimenu>
-                 Programs
-               </guimenu>
-               <guisubmenu>
-                 Accessories
-               </guisubmenu>
-               <guimenuitem>
-                 Text Editor
-               </guimenuitem>
-             </menuchoice> is the most convenient) and paste in the following:
-             <screen>
-               spamassassin -e
-             </screen>
-             This will run the SpamAssassin command and report back 0
-             if the message is not junk.
-           </para>
-         </listitem>
-         <listitem>
-           <para>
-             Save the file as "spam-filter.sh"
-           </para>
-         </listitem>
-         <listitem>
-           <para>
-              Mark the file as an executable program: 
-             Open your home directory in Nautilus, right-click on
-             spam-filter.sh there, and select
-             <guimenuitem>Properties</guimenuitem>. Then, click the
-             "Permissions" tab and check the box in the
-             <guilabel>Execute</guilabel> column and the
-             <guilabel>Owner</guilabel> row. Alternately, open a terminal
-             (<menuchoice>
-             <guimenu>
-               Programs
-             </guimenu>
-             <guisubmenu>
-               Accessories
-             </guisubmenu>
-             <guimenuitem>
-               Terminal
-             </guimenuitem>
-           </menuchoice>) and enter the command: chmod +x spam-filter.sh.
-       </para>
-     </listitem>
-     <listitem>
-       <para>
-          Back in Evolution, create a new filter: Select
-         <menuchoice><guimenu>Tools</guimenu><guimenuitem>Filters</guimenuitem></menuchoice>,
-         then click <guibutton>Add</guibutton>.
-     </para>
-   </listitem>
-
-             <listitem><para> 
-             Select "Pipe Message to Shell Command" as the first portion of the criterion.
-               </para></listitem>
-
-             <listitem><para> 
-             Enter "/home/username/spam-filter.sh" as the shell command, then select
-             "Does Not Return" and "0" as the remaining two
-             items. Substitute your username for "username" so that
-             Evolution can find the script.
-           </para></listitem>
-
-             <listitem><para>
-               For actions, choose what you'd like to do with the
-             messages. You can delete the messages automatically, but
-             it's more prudent to place them in a "Possible Junk Mail"
-             folder, and check them over just to make sure a genuine
-             message didn't get flagged by accident.
-             </para></listitem>
-           <listitem>
-             <para>
-               You're done. Click "OK" to close the filter and "OK" to
-               close the filter editor.
-             </para>
-           </listitem>
-         </orderedlist>
-       </para>
-     </example>
-   </sect2>
-   
-   <sect2 id="filters-edit">
-      <title>Editing Filters</title>
-      <para>
-	To edit a filter:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Filters</guimenuitem>
-	      </menuchoice>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the filter in the <guilabel>Filter Rules</guilabel> section
-	      and press <guibutton>Edit</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Change the desired settings.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press <guibutton>OK</guibutton> in the filter editor window.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press <guibutton>OK</guibutton> in the filter manager window.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-    
-    <sect2 id="filters-deleting">
-      <title>Deleting Filters</title>
-      <para>
-	To delete a filter:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenu>Filters</guimenu>
-	    </menuchoice>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the filter and press <guibutton>Delete</guibutton>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	<note>
-	  <title>Changing Folder Names and Filters</title>
-	  <para>
-	    <itemizedlist>
-	      <listitem>
-		<para>
-		  Incoming email that your filters don't move goes
-		  into the Inbox; outgoing mail that they don't move
-		  ends up in the Sent folder.  So be sure to change
-		  the filters that go with it.
-		</para>
-	      </listitem>
-	    </itemizedlist>
-	  </para>
-	</note>
-      </para>
-    </sect2>
-  </sect1>
-    
-    <sect1 id="usage-mail-organize-vfolders">
-      <title>Getting Really Organized with vFolders</title>
-      <para>
-	If filters aren't flexible enough for you, or you find
-	yourself performing the same search again and again, consider
-	a vFolder. vFolders, or virtual folders, are an advanced way
-	of viewing your email messages within
-	<application>Ximian Evolution</application>.  If you get a lot of
-	mail or often forget where you put messages, vFolders
-	can help you stay on top of things.
-      </para>
-      <para>
-	A vFolder is really a hybrid of all the other organizational
-	tools: it looks like a folder, it acts like a search, and you
-	set it up like a filter.  In other words, while a conventional
-	folder actually contains messages, a vFolder is a view of
-	messages that may be in several different folders.  The
-	messages it contains are determined on the fly using a set of
-	criteria you choose in advance.
-      </para>
-
-      <para>
-	As messages that meet the vFolder criteria arrive or are
-	deleted, <application>Ximian Evolution</application> will
-	automatically place them in and remove them from the
-	vFolder contents list.  When you delete a message, it gets
-	erased from the folder in which it actually exists, as well as
-	any vFolders which display it.
-      </para>
-
-      <para>
-	Imagine a business trying to keep track of mail from hundreds
-	of vendors and clients, or a university with overlapping and
-	changing groups of faculty, staff, administrators and
-	students.  The more mail you need to organize, the less you
-	can afford the sort of confusion that stems from an
-	organizational system that's not flexible enough.  vFolders
-	make for better organization because they can accept
-	overlapping groups in a way that regular folders and filing
-	systems can't.
-      </para>
-
-
-    <note id="unmatched-vfolder">
-      <title>The "Unmatched" vFolder</title>
-      <para>
-	 The Unmatched vFolder is the mirror of all your other
-         vFolders: it displays whatever messages are not matched by
-         other vFolders.
-      </para>
-      <para>
-        If you use remote email storage like IMAP or Microsoft
-        Exchange, and have created vFolders to search through them,
-        the Unmatched vFolder will follow your lead, and search the
-        remote folders as well. If you do not create any vFolders that
-        search in remote mail stores, the Unmatched vFolder will not
-        search in them either.
-      </para>
-    </note>
-
-
-    <example id="usage-mail-organize-vfolders-ex">
-      <title>Using Folders, Searches, and vFolders</title>
-      <para>
-	To organize his mailbox, Jim sets up a virtual folder for emails from
-	his friend and co-worker Anna.  He has another one for messages that
-	have ximian.com in the address and <application>Ximian Evolution</application> in the subject line, so he
-	can keep a record of what people from work send him about
-	<application>evolution</application>.  If Anna sends him a message about
-	anything other than <application>Ximian Evolution</application>, it only shows up in the "Anna" folder.
-	When Anna sends him mail about the user interface for
-	<application>evolution</application>, he can see that message both in
-	the "Anna" vFolder and in the "Internal Evolution Discussion"
-	vFolder.
-       </para>
-      </example>
-
-	<!--  (INSERT SCREENSHOT HERE: vFolders in action) -->
-
-    <sect2 id="vfolder-create">
-      <title>Creating vFolders</title>
-      <para>
-	To create a vFolder:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	    <menuchoice>
-	      <guimenu>Tools</guimenu>
-	      <guimenuitem>Virtual Folder Editor</guimenuitem>
-	    </menuchoice>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>Add</guibutton>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Name your vFolder in the <guilabel>Rule name</guilabel> field.
-
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select your search criteria. For each criterion, you
-	      must first select which of the following parts of the
-	      message you want the search to examine:
-	      <itemizedlist>
-		<listitem><para>
-		    Sender - The sender's address.
-		  </para></listitem>
-		
-		
-		<listitem><para>
-		    Recipients - The recipients of the message.
-		  </para></listitem>
-	  
-		<listitem><para>
-		    Subject - The subject line of the message.
-		  </para></listitem>
-
-<!--		No, can't vfolder on arbitrary headers
-		<listitem><para>
-		    Specific Header - The vFolder can look at any header you
-		    want, even obscure or custom ones. Enter the header name
-		    in the first text box, and put your search text in the
-		    second one.
-		  </para></listitem>
--->	
-
-		<listitem><para>
-		    Message Body - Search in the actual text of the message.
-		  </para></listitem>
-		
-		<listitem>
-		  <para>
-		    Expression - For programmers only: match a message according to an
-		    expression you write in the Scheme language, used to
-		    define vFolders in <application>Ximian Evolution</application>.
-		  </para>
-		</listitem>
-		
-		<listitem><para> Date sent - Search messages according to the date on
-		    which they were sent: First, choose the conditions you
-		    want a message to meet -- <guilabel>before</guilabel>
-		    a given time, <guilabel>after</guilabel> it, and so forth.
-		    Then, choose the time. The vFolder will compare the
-		    message's time-stamp to the system clock when the filter
-		    is run, or to a specific time and date you choose from a
-		    calendar.  You can even have it look for messages within a
-		    range of time relative to the filter -- perhaps you're
-		    looking for messages less than two days old.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Date Received - This works the same way as the <guilabel>Date Sent</guilabel> 
-		    option, except that it compares the time you got the message 
-		    with the dates you specify.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Label - This works the same way as the <guilabel>Score</guilabel> 
-		    option, although it allows you to select from various labels applied to the message,
-                such as <guilabel>Important, Personal, To Do,
-                Work</guilabel> or <guilabel>Later</guilabel>.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Score - Emails have a standard priority range from -3 (least
-		    important) to 3 (most important). You can have vFolders set the
-		    priority of messages you receive, and then have other
-		    vFolders 
-		    applied only to those messages which have a certain priority.
-		  </para></listitem>
-		
-		<listitem>
-		  <para>
-		    Size (kb) - Sorts based on the size of the message in kilobytes.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Status - Searches according to the status of a message, such as
-		    'New'.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Attachments - Create a vFolder based on  whether or not you have an
-		    attachment in the email.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Mailing List - Search based on the mailing list it came from.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Source Account - Search messages according the server you got them from.
-		    You can enter a URL or choose one from the drop-down
-		    list.  This ability is only relevant if you use more
-		    than one mail source.
-		  </para>
-		</listitem>
-	      </itemizedlist>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the folder sources.  You can select:
-	      <itemizedlist>
-		<listitem>
-		  <para>
-		    Specific folders only
-		    <note>
-		      <para>
-			If you select specific folders only, you need to specify the
-			source folders in the box below.
-		      </para>
-		    </note>
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    With all local folders
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    With all active remote folders
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    With all local and active folders
-		  </para>
-		</listitem>
-	      </itemizedlist>
-	      
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	Remote folders are considered active if you are connected to the
-	server; you must be connected to your mail server for the vFolder to
-	include any messages from that source.
-      </para>
-      <para>
-      <figure id="usage-mail-vfolder-fig-createrule">
-	<title>Selecting a vFolder Rule</title>
-	<screenshot>
-	  <screeninfo>Creating a vFolder Rule</screeninfo>
-	    <mediaobject>
-	      <imageobject>
-		<imagedata fileref="figures/vfolder-createrule-fig" format="PNG"
-			   srccredit="Aaron Weber"/>
-	      </imageobject>
-	    </mediaobject>
-	  </screenshot>
-	</figure>
-      </para>
-    </sect2>
-  </sect1>
-</chapter>
diff --git a/help/C/usage-mail.xml b/help/C/usage-mail.xml
deleted file mode 100644
index a1a3bcb018..0000000000
--- a/help/C/usage-mail.xml
+++ /dev/null
@@ -1,1865 +0,0 @@
-<chapter id="usage-mail">
-  <title>Using Evolution for Email</title>
-  <para>
-    This chapter, and <xref linkend="usage-mail-organize"/>, will
-      provide you with an in-depth guide to the capabilities of
-      Evolution as a mail client.  For information about how to set up
-      your mail account, see <xref linkend="config-prefs-mail"/>.
-  </para>
-  
-  <note>
-    <title>If you use IMAP Mail</title>
-    <para>
-      If you chose IMAP mail during the setup process, you must
-      subscribe to your mail folders before you can read mail in
-      them. Read <xref linkend="usage-mail-subscriptions"/> to find out
-      how.
-    </para>
-  </note>
-  
-  
-  <sect1 id="usage-mail-getnsend-read">
-    <title>Reading Mail</title>    
-    <para>
-      Start the mail client by clicking on the
-      <guibutton>Inbox</guibutton> icon in the shortcut bar, or by
-      selecting a mail folder in the folder bar.  To read a message,
-      select it in the message list; if you'd like to see it in its
-      own window, double-click on it or press
-      <keycombo action="simul">
-	<keycap>Ctrl</keycap>
-	<keycap>O</keycap>
-      </keycombo>.
-    </para>
-
-
-      <tip id="spaceandbs">
-	<title>Reading Mail with the Keyboard</title>
-	<para>
-	  You can click the space bar to page down while you're reading
-	  an email, and press backspace to page up in an email.  This
-	  may help to make reading your email faster.
-	</para>
-    
-        <para>
-          You can navigate the message list by pressing the arrow keys up
-          and down. To jump to the next unread message, press the
-          <keycap>.</keycap> (period)
-          or <keycap>]</keycap> (close bracket) key. You can go to the
-          previous unread message with
-          <keycap>,</keycap> (comma) or <keycap>[</keycap> (open
-          bracket).
-        </para>
-      </tip>
-
-    <sect2 id="usage-mail-listorder">
-      <title>Sorting the message list</title>
-      <para>
-	<application>Evolution</application> helps you work by letting you sort
-	your email.  To sort by sender, subject, or date, click
-	on the bars with those labels at the top of the message
-	list. The direction of the arrow next to the label indicates
-	the direction of the sort, and if you click again, you'll
-	sort them in reverse order. For example, click once on
-	<guilabel>Date</guilabel> to sort messages by date from
-	oldest to newest.  Click again, and
-	<application>Evolution</application> sorts the list from
-	newest to oldest. You can also right-click on the message
-	header bars to get a set of sorting options, and add or
-	remove columns from the message list.  You can find detailed
-	instructions on how to customize your message display
-	columns in <xref linkend="usage-mail-organize-columns"/>.
-      </para>
-
-      <tip id="view-headers">
-	<title>Email Headers</title>
-	<para>
-	  To look at the complete headers for email messages, select
-          <menuchoice><guimenu>View</guimenu><guisubmenu>Message
-	  Display</guisubmenu><guimenuitem>Show Full
-	  Headers</guimenuitem></menuchoice>. To see absolutely every
-	  bit, choose
-	  <menuchoice><guimenu>View</guimenu><guisubmenu>Message
-	  Display</guisubmenu><guimenuitem>Show Email Source
-	  </guimenuitem></menuchoice>.
-       </para>
-      </tip>
-
-      <para>
-	You can also choose a threaded message view. Select
-	<menuchoice> 
-	  <guimenu>View</guimenu>
-          <guimenuitem>Threaded</guimenuitem> 
-	</menuchoice> 
-	to turn the threaded view on or off.  When you select this option,
-	<application>Evolution</application> groups the replies to a
-	message with the original, so you can follow the thread of a
-	conversation from one message to the next.
-      </para>
-      <figure>
-        <title>Threaded Mail View</title>
-	<screenshot>
-	  <screeninfo>Threaded Mail View</screeninfo>
-	  <mediaobject><imageobject>
-	      <imagedata  format="PNG" fileref="figures/mail-threaded" srccredit="Aaron Weber"/>
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-
-    </sect2>
-    
-    <sect2 id="usage-mail-getnsend-delete">
-        <title>Deleting Mail</title>
-        <para>
-          Once you've read your mail, you may want to get rid of
-          it. 
-	To delete a message:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Click the message to select it
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press delete button or right click on the message and
-	      choose <guilabel>Delete</guilabel>.
-	    </para>
-	    <note>
-	      <title>Why do I still see deleted mail?</title>
-	      <para>
-		When you press <guibutton>Delete</guibutton> or click
-		the trash button, your mail isn't actually deleted,
-		but is marked for deletion.  Your email is not gone
-		until you have expunged it. When you "Expunge" a
-		folder, you remove all the mail that you have marked
-		for deletion.
-	      </para>
-              <para>
-                 If you don't like this behavior, select
-                 <menuchoice><guimenu>View</guimenu><guimenuitem>Hide
-                 Deleted Messages</guimenuitem></menuchoice>. Then,
-                 you will only see deleted messages when you look in
-                 your <guilabel>Trash</guilabel> folder.
-              </para>
-	    </note>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click
-	      <menuchoice>
-		<guimenu>Actions</guimenu>
-		<guimenuitem>Expunge</guimenuitem>
-	      </menuchoice>
-	      or press
-	      <keycombo action="simul">
-		<keycap>Ctrl</keycap>
-		<keycap>E</keycap>
-	      </keycombo>
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <note>
-	<title>Trash is Actually a vFolder?</title>
-	<para>
-	  Both local and IMAP Trash folders are actually vFolders that
-          display all messages you have marked for later deletion.
-          For more information about vFolders, see <xref
-          linkend="usage-mail-organize-vfolders"/>.  Since emptying
-          your trash expunges the messages in your Trash folder,
-          choosing <menuchoice> <guimenu>Actions</guimenu>
-          <guimenuitem>Empty Trash</guimenuitem> </menuchoice> is the
-          same as expunging deleted mail from <emphasis>all</emphasis>
-          your folders.
-	</para>
-        <para>
-           This is not, however, true for the Trash folder on Exchange
-           servers, which behaves just the same as it would in
-           Outlook. That is to say, the Trash folder on an Exchange
-           server is a normal folder with actual messages in it.
-        </para>
-      </note>
-    </sect2>
-    <sect2 id="usage-mail-getnsend-undelete">
-      <title>Undeleting Messages</title>
-      <para>
-	To undelete a message:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select a message you have marked for deletion.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press <keycombo
-	      action="simul"><keycap>Ctrl</keycap><keycap>U</keycap>
-	      </keycombo>
-	      or choose
-	      <menuchoice>
-		<guimenu>Edit</guimenu>
-		<guimenuitem>Undelete</guimenuitem>
-	      </menuchoice>
-
-	    </para>
-	    <note>
-	      <title>What does Undelete actually do?</title>
-	      <para>
-                If you have marked a message for deletion, undeleting
-		it will unmark it, and the message will be removed
-		from the Trash folder. However, it can't bring back
-		messages that have been expunged.
-	      </para>
-	    </note>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="usage-mail-getnsend-get">
-    <title>Checking for New Mail</title>
-    <para>
-      Now that you've had a look around the
-      <interface>Inbox</interface>, it's time to check for new mail.
-      Click <guibutton>Send/Receive</guibutton> in the toolbar to check
-      your mail.  If you haven't entered any mail settings yet, the
-      <interface>setup assistant</interface> will ask you for the
-      information it needs to check your email.
-    </para>
-    <para>
-      The assistant will give you several dialog boxes where you configure:
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    your personal information
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    your outgoing email server information
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    your mail account identity name
-	  </para>
-	</listitem>
-      </itemizedlist>
-    </para>
-    <para>
-      To check your email, press the <guibutton>Check Mail</guibutton>
-      button.  If this is your first time checking mail, or you
-      haven't asked <application>Evolution</application> to store your
-      password, you'll be prompted for the password.  Enter your
-      password and your email will be downloaded.
-    </para>
-    <note id="badmailsettings">
-      <title>Can't Check Mail?</title>
-      <para>
-	If you get an error message instead of mail, you probably need
-	to check your network settings.  To learn how to do that, have
-	a look at <xref linkend="config-prefs-mail"/>, or ask your
-	system administrator.
-       </para>
-     </note>
-
-
-
-          <tip>
-            <title>Sharing Mailboxes with Other Mail Programs</title>
-            <para>
-              If you want to use <application>Evolution</application>
-              and another email client, such as
-              <application>Mutt</application>, at the same time,
-              here's how:
-              <orderedlist numeration="arabic">
-                <listitem>
-                   <para>
-                      Download your mail in the other application as
-                      you would normally.
-                   </para>
-                  </listitem>
-                <listitem>
-                   <para>
-                      In <application>Evolution</application>, select
-                      <menuchoice><guimenu>Tools</guimenu><guimenuitem>
-                      Settings</guimenuitem></menuchoice>, go to the
-                      Mail Accounts configuration tool, and pick the account
-                      you'd like to use to share mail. You may want to
-                      create a new account just for this source of
-                      mail.
-                   </para>
-               </listitem>                     
-               <listitem>
-                   <para>
-                      Under the <guilabel>Receiving Mail</guilabel>
-                      tab, select the type of mail file that your
-                      other mail application uses, and then enter the
-                      full path to that location. A typical choice
-                   would be mbox files, with the path /home/username/Mail/.
-                 </para>
-                  </listitem>
-                <listitem>
-                   <para>
-                      Click the <guibutton>OK</guibutton> button.
-                   </para>
-                  </listitem>
-                </orderedlist>
-               </para>
-            </tip>
-
-
-<!-- NOT FOR 1.0
-       <sect2 id="usage-mail-getnsend-get-news">
-	  <title>Using Evolution for News</title>
-	<para>
-	  Newsgroups are so similar to email that there's no reason not
-	  to read them side by side.  If you want to do that, add a
-	  news source to your configuration (see <xref
-	  linkend="config-prefs-network-news"/>). The news server will
-	  appear as a remote server, and will look quite similar to an
-        IMAP folder.  When you click <guibutton>Send/Receive</guibutton>,
-	  <application>Evolution</application> will also check for news
-	  messages.
-	</para>
-	</sect2>
--->
-
-     <sect2 id="usage-mail-getnsend-get-attach">
-	 <title>Working with Attachments and HTML Mail</title>
-	 <para>
-	   If someone sends you an <glossterm linkend="attachment">attachment</glossterm>,
-	   a file attached to an email,
-	   <application>Evolution</application> will display the file
-	   at the bottom of the message to which it's attached.  Text,
-	   including HTML formatting and embedded images, will appear
-	   as part of the message, rather than at the end of the
-	   message as an attachment.
-     </para>
-
-     <sect3 id="usage-mail-getnsend-get-attach-actions">
-     <title>Saving or Opening Attachments</title>
-     <para>
-        If you get an attachment with an email message,
-        <application>Ximian Evolution</application> can help you save
-        it or open it with the appropriate applications.
-     </para>
-     <para>
-       To save an attachment to disk:
-       <orderedlist numeration="arabic">
-	 <listitem>
-	   <para>
-	     Click the downward pointing arrow on the attachment icon
-	     and select <guimenuitem>Save to Disk</guimenuitem>.
-	   </para>
-	 </listitem>
-	 <listitem>
-	   <para>
-	     Choose a location and name for the file.
-	   </para>
-	 </listitem>
-	 <listitem>
-	   <para>
-	     Click <guibutton>OK</guibutton>.
-	   </para>
-	 </listitem>
-       </orderedlist>
-      </para>
-
-      <para>
-	To Open an Attachment in a Program:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Open the mail message with the attachment you want to read.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the arrow next the attachment icon.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the program you'd like to use. It will start up
-	      and open the document.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-      </para>
-      </sect3>
-
-      <sect3 id="usage-mail-getnsend-get-attach-html">
-      <title>Inline Images in HTML Mail</title>
-      <para>
-         When someone sends you HTML mail that includes an image in
-         the body of the message (for example, the welcome message in your
-         Inbox when you first start <application>Ximian
-         Evolution</application>) <application>Evolution</application>
-         will display the image inside the message.  You can create
-         messages like this by using the
-         <menuchoice><guimenu>Insert</guimenu><guimenuitem>Image</guimenuitem></menuchoice>
-         tool in the message composer.
-      </para>
-
-      <para>
-         If the image isn't included in the message, but is, instead,
-         a link to an image, <application>Evolution</application> can 
-         download the image from the Internet for you.  However,
-         <application>Evolution</application> will not display the
-         image unless you ask it to. This is because remotely hosted
-         images can be slow to load and display, and can even be used
-         by spammers to track who reads their email.  Having images
-         not load automatically helps protect your privacy.
-      </para>
-      <para>
-	 If you want the images to load for one message, select 
-	 <menuchoice>
-	   <guimenu>View</guimenu>
-	   <guisubmenu>Message Display</guisubmenu>
-	   <guimenuitem>Load Images</guimenuitem>
-         </menuchoice>.  
-
-         If you want <application>Ximian Evolution</application> to
-         load remotely hosted images more often, select
-         <menuchoice>
-	   <guimenu>Tools</guimenu>
-	   <guimenuitem>Settings</guimenuitem> </menuchoice> and go to
-	   the mail settings tool. There, click the <guilabel>HTML
-           Mail</guilabel> tab and select one of the items there: <guilabel>Never load images off the net</guilabel>, <guilabel>Load images if sender is in addressbook</guilabel>, or <guilabel>Always load images off the net.</guilabel>
-      </para>
-      <note id="http-proxy">
-	<title>Loading Images from the Net through an HTTP Proxy</title>
-        <para>
-           If you use an HTTP proxy (as in many large organizations),
-          <application>Evolution</application> must be able to find
-           it through the <systemitem>gnome-vfs</systemitem> subsystem
-           before it can load images from the Internet.  This is also
-           the case if you wish to access weather and news information
-           through the Summary tool. 
-         </para>
-         <para>
-           If you are using GNOME 1.4, you will need to configure this
-           in the Nautilus <guilabel>Preferences</guilabel>
-         dialog. However, in GNOME 2.0 and later, you can use the
-         GNOME Control Center. Select
-         <menuchoice><guimenu>System</guimenu><guimenuitem>Settings</guimenuitem></menuchoice>
-         from your menu panel or from the GNOME menu, and then click
-         the <guibutton>Network Proxies</guibutton> button in the
-         <guilabel>System Settings</guilabel> category. Select the
-         <guilabel>Use an HTTP network proxy</guilabel> check box and
-         then enter information about your proxy. If you are not sure,
-         check with your ISP or system administrator.
-       </para>
-      </note>
-     </sect3>
-    </sect2>
-  </sect1>
-
-    <sect1 id="usage-mail-getnsend-send">
-      <title>Composing New Email Messages</title>
-      <para>
-         You can start writing a new email message by selecting
-         <menuchoice> <guimenu>File</guimenu>
-         <guisubmenu>New</guisubmenu> <guimenuitem>
-         Mail Message</guimenuitem></menuchoice>, or by pressing the
-         <guibutton>New</guibutton> button in the Inbox toolbar.
-         When you do so, the <interface>New Message</interface> window
-         will open, as shown in <xref
-         linkend="usage-mail-newmsg-fig"/>.
-      </para>
-
-<!--   ==============Figure=================================== -->
-      <figure id="usage-mail-newmsg-fig">
-        <title>New Message Window</title>
-        <screenshot>
-          <screeninfo>Evolution Main Window</screeninfo>
-          <mediaobject><imageobject><imagedata fileref="figures/newmsg" format="PNG" srccredit="Aaron Weber"/>
-        </imageobject></mediaobject>
-        </screenshot>
-      </figure>
-<!-- ==============End of Figure=================================== -->
-
-      <para>
-      Enter an address in the <guilabel>To:</guilabel> field.  If you
-      wish, enter a subject in the <guilabel>Subject:</guilabel>, and
-      a message in the box at the bottom of the window.
-      Once you have written your message, press
-      <guibutton>Send</guibutton>.
-    </para>
-
-     <sect2 id="usage-mail-getnsend-send-delay">
-        <title>Sending Composed Messages Later</title>
-        <para>
-           <application>Evolution</application> will normally send
-           mail as soon as you click the <guibutton>Send</guibutton>
-           button. However, there are a few ways you can save a
-           message to be sent later:
-
-       <itemizedlist>
-          <listitem>
-             <para>
-                If you are offline,
-                <application>Evolution</application> will add your
-                messages to the <guilabel>Outbox</guilabel> queue. The
-                next time you connect to the Internet and send or
-                receive mail, that message will be sent.
-            </para>
-           </listitem>
-
-        <listitem><para>
-          Choose
-	  <menuchoice>
-	   <guimenu>File</guimenu>
-	    <guimenuitem>Save Draft</guimenuitem>
-          </menuchoice>
-          to store your messages in the drafts folder for later
-          revision.
-       </para></listitem>
-
-        <listitem><para> 
-         If you prefer to save your message as a text file,
-         choose <guimenuitem>Save As</guimenuitem> and then choose a
-         file name.
-           </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-    </sect2>
-
-    <sect2 id="usage-mail-getnsend-offline">
-      <title>Working Offline</title>
-    
-      <para>
-        Offline mode is a tool designed for use with IMAP or Exchange
-        mail accounts in situations where you will not be connected to
-        the network at all times. It will keep a local copy of one or
-        more folders, and allow you to compose messages, storing them
-        in your Outbox to be sent the next time you connect.
-      </para>
-     
-      <para>
-        While POP mail downloads all messages to your local system,
-        IMAP and Exchange connections usually download just the
-        headers, and fetch the rest only when you want to read the
-        message.  Before you go offline, Evolution will download
-        the unread messages from the folders you have chosen to
-        store.
-      </para>
-
-      <para>
-        To mark a folder for offline use, select <menuchoice>
-        <guimenu>Settings</guimenu>
-        <guimenuitem>Preferences</guimenuitem> </menuchoice> and then
-        click the <guilabel>Folders</guilabel> icon. In the
-        <guilabel>Offline Folders</guilabel> tab, click the check-box
-        next to the folders that you would like to use while you are
-        offline. 
-      </para>
-
-      <para>
-        Your connection status is shown by the small icon in the lower
-        left border of the Evolution main window. When you are online,
-        it will display two connected cables. When you go offline, the
-        cables will separate.
-      </para>
-
-      <para>
-        To cache your selected folders and disconnect from the
-        network, select <menuchoice><guimenu>File</guimenu><guimenuitem>Work
-        Offline</guimenuitem></menuchoice> or click the
-        connection status icon in the lower left of the screen. When you
-        want to reconnect, choose
-        <menuchoice><guimenu>File</guimenu><guimenuitem>Work
-        Online</guimenuitem></menuchoice> or click the connection
-        status icon again.
-      </para>
-           
-       </sect2>
-    <sect2 id="usage-mail-getnsend-send-compose">
-      <title>More About Mail Composition</title>
-      <para>
-        In the next few sections, you'll see how
-	<application>Evolution</application> handles advanced email
-	features, including large recipient lists, attachments, and
-	forwarding.
-      </para>
-      <sect3 id="usage-mail-getnsend-send-attach">
-        <title>Attachments</title>
-        <para>
-	  To attach a file to your email:
-	  <orderedlist numeration="arabic">
-	    <listitem>
-	      <para>
-		Push the attach button in the composer toolbar
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Select the file you want to attach
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Press <guibutton>OK</guibutton>
-	      </para>
-	    </listitem>
-	  </orderedlist>
-	</para>
-	<para>
-	  You can drag a file from your desktop into the composer window to
-	  attach it as well.
-        </para>
-        <para>
-            To hide the display of files you've attached to the
-            message, select <menuchoice>
-            <guimenu>View</guimenu> <guimenuitem>Hide
-            Attachments</guimenuitem> </menuchoice>; to show them
-            again, choose <guimenuitem>Show Attachments</guimenuitem>.
-        </para>
-        <para>
-            When you send the message, a copy of the attached file
-            will go with it.  Be aware that big attachments can take a
-            long time to download.
-        </para>
-       </sect3>
-
-      <sect3 id="usage-mail-getnsend-send-to-types">
-	<title>Specifying Recipients for Email</title>
-        <para>
-	  <application>Evolution</application>, like most email
-	   programs, recognizes three types of addressee: primary
-	   recipients, secondary recipients, and hidden ("blind")
-	   recipients.
-         </para>
-         <para>
-            The simplest way to direct a message is to put the email
-            address or addresses in the <guilabel>To:</guilabel>
-            field, which denotes primary recipients.  To send mail to
-            more than one or two people, you can use the
-            <guilabel>Cc:</guilabel> field.
-          </para>
-          <para>
-            Hearkening back to the dark ages when people used
-            typewriters and there were no copy machines, "Cc" stands
-            for "Carbon Copy."  Use it whenever you want to share a
-            message you've written to someone else.
-          </para>
-          <para>
-            <guilabel>Bcc:</guilabel> is a little more complex.  You
-            use it like <guilabel>Cc:</guilabel>, but people on the
-            <guilabel>Bcc:</guilabel> list are hidden from the other
-            recipients of the message. Use it to send mail to large
-            groups of people, especially if they don't know each other
-            or if privacy is a concern.  If your <guilabel>Bcc:</guilabel> field is absent, click
-	    <menuchoice>
-	      <guimenu>View</guimenu>
-	      <guimenuitem>Bcc Field</guimenuitem>
-	    </menuchoice>.
-		
-          </para>
-
-         <para>
-           If you frequently write email to the same groups of people,
-           you can create address lists in the Contact Manager, and
-           then send them mail as though they had a single address.
-           To learn how to do that, read <xref
-           linkend="usage-contact-organize-group-list"/>.
-        </para>
-
-	<tip id="reply-to-per-mail">
-	  <title>Setting Reply-to On a Per-Mail Basis</title>
-	  <para>
-	    <application>Evolution</application> has the ability to
-	    let you specify the Reply-To in an email. Using this, you
-	    can setup a special Reply-To for an email.  To do this:
-	    <orderedlist numeration="arabic">
-	      <listitem>
-                <para>
-		  Open a composer window
-			 </para>
-			 </listitem>
-			 <listitem>
-			 <para>
-			 Open the Reply-To field by selecting
-			 <menuchoice>
-			 <guimenu>View</guimenu>
-			 <guimenuitem>Reply To</guimenuitem>
-			 </menuchoice>
-			 </para>
-			 </listitem>
-			 <listitem>
-			 <para>
-			 Enter the address you wish to have be the
-			 Reply-To address in the new Reply-To field.
-			 </para>
-			 </listitem>
-			 </orderedlist>			 
-	  </para>
-	</tip>
-        </sect3>
-			 
-        <sect3 id="usage-mail-getnsend-send-to">
-	      <title>Choosing Recipients Quickly</title>
-	      <para>
-		If you have created address cards in the contact manager,
-          you can also enter nicknames or other portions of address
-          data, and <application>Evolution</application> will offer a
-          drop down list of possible address completions from your
-          address book.  If you enter a name or nickname that can go
-          with more than one card, Evolution will open a dialog box to
-          ask you which person you meant. 
-
-<!-- 
-     Also, <application>Evolution</application> will add a
-          domain to any unqualified addresses.  By default, this is
-          your domain, but you can choose which one mail preferences
-          dialog. NOTE: ex-feature, may be reinstated, but probably not. 
--->
-          </para>
-
-          <para>
-            Alternately, you can click on the
-            <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
-            <guibutton>Bcc:</guibutton> buttons to get a list --
-            potentially a very long one -- of the email addresses
-            in your contact manager.  Select addresses and click on
-            the arrows to move them into the appropriate address
-            columns.
-          </para>
-          <para>
-            For more information about using email together with the
-            contact manager and the calendar, see <xref
-            linkend="contact-automation-basic"/> and <xref
-            linkend="usage-calendar-apts"/>.
-          </para>
-        </sect3>
-      </sect2>
-
-      <sect2 id="usage-mail-getnsend-send-reply">
-        <title>Replying to Email Messages</title>
-        <para>
-           To reply to a message, press the
-           <guibutton>Reply</guibutton> button while it is selected,
-           or choose <guimenuitem>Reply to Sender</guimenuitem> from
-           the message's right-click menu.  That will open the
-           <interface>message composer</interface>.  The
-           <guilabel>To:</guilabel> and <guilabel>Subject:</guilabel>
-           fields will already be filled, although you can alter them
-           if you wish.  In addition, the full text of the old message
-           is inserted into the new message, either grey (for
-           HTML display) or with the &gt; character before each line
-           (in plain text mode), to indicate that it's part of the
-           previous message.  People often intersperse their message
-           with the quoted material as shown in <xref
-           linkend="usage-mail-getnsend-reply-fig"/>.
-
- <!-- ==============Figure=================================== -->
-       <figure id="usage-mail-getnsend-reply-fig">
-         <title>Reply Message Window</title>
-         <screenshot>
-          <screeninfo>Evolution Main Window</screeninfo>
-          <mediaobject><imageobject><imagedata fileref="figures/replymsg" format="PNG" srccredit="Aaron Weber"/>
-        </imageobject></mediaobject>
-        </screenshot>
-      </figure>
-<!-- ==============End of Figure=================================== -->
-        </para>
-        <para>
-          If you're reading a message with several recipients, you may
-           wish to use <guibutton>Reply to All</guibutton> instead of
-           <guibutton>Reply</guibutton>.  If there are large numbers
-           of people in the <guilabel>Cc:</guilabel> or
-           <guilabel>To:</guilabel> fields, this can save substantial
-           amounts of time.
-          <example>
-            <title>Using the Reply to All feature</title>
-            <para>
-              Susan sends an email to a client and sends copies to Tim
-              and to an internal company mailing list of co-workers.
-              If Tim wants to make a comment for all of them to read,
-              he uses <guibutton>Reply to All</guibutton>, but if he
-              just wants to tell Susan that he agrees with her, he
-              uses <guibutton>Reply</guibutton>.  Note that his reply
-              will not reach anyone that Susan put on her
-              <guilabel>Bcc</guilabel> list, since that list is not
-              shared with anyone.
-            </para>
-          </example>
-        </para>
-        <para>
-          If you're subscribed to a mailing list, and want your reply
-          to go just to the list, rather than to the sender, choose
-          <guibutton>Reply to List</guibutton> instead of
-          <guibutton>Reply</guibutton> or <guibutton>Reply to
-          All</guibutton>.
-          <note>
-            <title>What is a Mailing List?</title>
-            <para>
-              Mailing Lists are one of the most popular tools for
-              group collaboration on the Internet. Here's how they work: 
-              <simplelist>
-                <member>
-                  Someone sends a message to a single address, like
-                  <email>evolution@ximian.com</email>.
-                </member>
-                <member>
-                  That address belongs to a program that distributes
-                  the message to a list of recipients.
-                </member>
-             </simplelist>
-               The mail management program lets individuals subscribe
-               to or unsubscribe from the list at will, without
-               requiring the message writers to remember the addresses
-               of every recipient.
-            </para>
-            <para>
-              Mailing list servers can also let network administrators
-              control mail flow, list membership, and even moderate
-              the content of mailing lists.
-            </para>
-          </note>
-        </para>
-      </sect2>
-
-      <sect2 id="usage-mail-getnsend-send-find">
-        <title>Searching and Replacing with the Composer</title>
-        <para>
-           You are probably familiar with search and replace features
-           in any sort of text-editing software, and if you come from
-           a Linux or Unix background, you may know what
-           <guimenuitem>Find Regex</guimenuitem> does.  If you aren't
-           among the lucky who already know, here's a quick rundown of
-           the automated text searching features that the message
-           composer makes available to you.
-        </para>
-        <para>
-           <variablelist>
-            <varlistentry>
-              <term><guimenuitem>Find</guimenuitem></term>
-              <listitem><para> Enter a word or phrase, and
-              <application>Evolution</application> will find it
-              in your message.
-              </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term><guimenuitem>Find Regex</guimenuitem></term>
-              <listitem>
-                <para>
-                  Find a regex, also called a
-                  <glossterm linkend="regular-expression">regular
-                  expression</glossterm>, in your composer window.
-               </para>
-             </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term><guimenuitem>Find Again</guimenuitem></term>
-              <listitem><para>
-                   Select this item to repeat the last search you performed.
-              </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-               <term><guimenuitem>Replace</guimenuitem></term>
-               <listitem><para>
-                 Find a word or phrase, and replace it with
-                 something else.
-               </para></listitem>
-            </varlistentry>
-
-          </variablelist>
-        </para>
-
-        <para>
-            For all of these menu items, you can choose whether or not
-            to <guilabel>Search Backwards</guilabel> in the document
-            from the point where your cursor is.  For all but the
-            regular expression search (which doesn't need it), you are
-            offered a check box to determine whether the search is to
-            be <guilabel>Case Sensitive</guilabel> when it determines
-            a match.
-        </para>
-      </sect2>
-
-      <sect2 id="usage-mail-getnsend-send-html">
-        <title>Enhance your email with HTML</title>
-        <para>
-            Normally, you can't set text styles or insert pictures in
-            emails, which is why email is often regarded as
-            uncommunicative and cold, and why people often resort to
-            using far too many exclamation points to convey their
-            feelings.  However, most newer email programs can display
-            images and text styles as well as basic alignment and
-            paragraph formatting. They do this with <glossterm
-            linkend="html">HTML</glossterm>, just like web pages do.
-        </para>
-        <note>
-          <title>HTML Mail is not a Default Setting</title>
-          <para>
-            Some people do not have HTML-capable mail clients, or
-            prefer not to receive HTML-enhanced mail because it is
-            slower to download and display. Because some people may
-            prefer not to get HTML mail,
-            <application>Evolution</application> sends plain text
-            unless you explicitly ask for HTML.  
-           </para>
-	 </note>
-
-	 <para> You can change the format of an email message between
-            plain text and HTML by choosing <menuchoice>
-            <guimenu>Format</guimenu> <guimenuitem>
-            HTML</guimenuitem></menuchoice>.
-	  </para>
-	  <para>
-            To send all your mail as HTML by default, set your mail
-            format preferences in the mail configuration dialog.  See
-            <xref linkend="config-prefs-mail-composer"/> for more
-            information.
-      </para>
-      <para>
-	HTML formatting tools are located in the toolbar just above
-	the space where you'll actually compose the message, and
-	they also appear in the <guimenu>Insert</guimenu> and
-	<guimenu>Format</guimenu> menus.
-      </para>
-      <para>
-	The icons in the toolbar are explained in <glossterm
-            linkend="tooltip">tool-tips</glossterm>, which appear when
-            you hold your mouse over the buttons.  The buttons fall
-            into four categories:
-            <variablelist>
-             <varlistentry>
-             <term>Headers and lists</term>
-              <listitem>
-                <para>
-                  At the left edge of the toolbar, you can choose
-                  <guilabel>Normal</guilabel> for a default text style
-                  or <guilabel>Header 1</guilabel> through
-                  <guilabel>Header 6</guilabel> for varying sizes of
-                  header from large (1) to tiny (6). Other styles
-                  include <guilabel>preformat</guilabel>, to use the HTML
-                  tag for preformatted blocks of text, and three types
-                  of bullet points for the highly
-                  organized.
-                </para>
-	      <tip>
-		<title>Using Bullets to Make Your Email More
-		Attractive</title>
-		<para>
-		  Instead of using asterisks to mark a bulleted list,
-		  try the Bulleted List style from the style dropdown
-		  list.  <application>Evolution</application> uses
-		  more attractive bullets and handles word wrap and
-		  multiple levels of indentation.
-		</para>
-	      </tip>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Text style</term>
-	    <listitem>
-	      <para>
-		Use these buttons to determine the way your letters
-		look.  If you have text selected, the style will
-		apply to the selected text.  If you do not have text
-		selected, the style will apply to whatever you type
-		next.  The buttons are:
-		<itemizedlist mark="none">
-		  <listitem><para>Push <guibutton>B</guibutton> for bold text</para></listitem>
-		  <listitem><para>Push <guibutton>I</guibutton> for italics</para></listitem>
-		  <listitem><para>Push <guibutton>U</guibutton> to underline</para></listitem>
-		  <listitem><para>Push <guibutton>S</guibutton> for a strikethrough.</para></listitem>
-		</itemizedlist>
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-              <term>Alignment</term>
-	    <listitem>
-	      <para>
-		Located next to the text style buttons, these three
-		paragraph icons should be familiar to users of most
-		word processing software.  The leftmost button will
-		make your text aligned to the left, the center
-		button, centered, and the right hand button,
-		aligned on the right side.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-            <varlistentry>
-              <term>Indentation rules</term>
-              <listitem>
-                <para>
-                  The button with the arrow pointing left will reduce
-                  a paragraph's indentation, and the right arrow will
-                  increase its indentation.
-               </para>
-            </listitem>
-          </varlistentry>
-
-            <varlistentry>
-              <term>Color Selection</term>
-              <listitem>
-                <para>
-                  At the far right is the color section tool.  The
-                  colored box displays the current text color; to
-                  choose a new one, click the arrow button just to the
-                  right. If you have text selected, the color will
-                  apply to the selected text.  If you do not have text
-                  selected, the color will apply to whatever you type
-                  next.  You can select a background color or image by
-                  right-clicking on the message background and
-                  selecting <guilabel>Page</guilabel>.
-               </para>
-            </listitem>
-          </varlistentry>
-          </variablelist>
-        </para>
-        <para>
-	The <guimenu>Insert</guimenu> gives you opinions which let you
-           spruce up your email to make it more interesting:
-	<variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Insert Link</guimenuitem></term>
-	    <listitem>
-	      <para>
-		Lets you link some text to a website.  Use this tool to put hyperlinks in your HTML
-                  messages.  If you don't want special link text, you can just enter the address
-                  directly, and <application>Evolution</application>
-                  will recognize it as a link.  To add a link:
-		<orderedlist numeration="arabic">
-		  <listitem>
-		    <para>
-		      Select the text you wish to link from.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Right click on the text and click on <guibutton>Link</guibutton>.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Put the URL you want to use in the <guilabel>URL</guilabel> field.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Click <guibutton>OK</guibutton>.
-		    </para>
-		  </listitem>
-		</orderedlist>
-	      </para>
-	      <note>
-		<para>
-		  If you're typing a web page address to be automatically formatted, keep in mind that a space terminates the link.
-		</para>
-	      </note>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guimenuitem>Insert Image</guimenuitem></term>
-	    <listitem>
-	      <para>
-		Lets you put an image alongside text.
-	      </para>
-	      <para>
-		To insert an image into your email:
-		<orderedlist numeration="arabic">
-		  <listitem>
-		    <para>
-		      Make sure that you have the
-		      <menuchoice>
-			<guimenu>Format</guimenu>
-			<guimenuitem>HTML</guimenuitem>
-		      </menuchoice>
-                      selector checked.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Click the <guibutton>Insert Image</guibutton> button in the toolbar, or select		   
-		         <menuchoice>
-			<guimenu>Insert</guimenu>
-			<guimenuitem>Image</guimenuitem>
-		      </menuchoice>.
-		      </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Choose your image by clicking the <guibutton>Browse</guibutton> button.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Press <guibutton>Insert</guibutton> to insert the image.
-		    </para>
-		  </listitem>
-		</orderedlist>
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guimenuitem>Insert Rule</guimenuitem></term>
-	    <listitem>
-	      <para>
-		Inserts a horizontal line into the text to help divide two
-		sections.
-	      </para>
-	      <para>
-		To insert a rule:
-		<orderedlist numeration="arabic">
-       		  <listitem>
-		    <para>
-		      Make sure that you have the
-		      <menuchoice>
-			<guimenu>Format</guimenu>
-			<guimenuitem>HTML</guimenuitem>
-		      </menuchoice>
-                      selector checked.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Click the <guibutton>Rule</guibutton> button in the <guilabel>Toolbar</guilabel>.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Select the type of rule. You can use a plain
-		      line, a 3D line, or a yellow line with flowers.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Choose the size of the line, as a percentage of the width of the email window.
-		    </para>
-		  </listitem>
-
-		  <listitem>
-		    <para>
-		      Choose the alignment and style.  For the plain
-		      line, you can choose the thickness of the line,
-		      and whether it will be shaded, or solid.  For the
-		      other types, you can only choose alignment.
-		    </para>
-		  </listitem>
-
-		  <listitem>
-		    <para>
-		      Click <guibutton>Insert</guibutton> to insert the rule.
-		    </para>
-		  </listitem>
-		</orderedlist>
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Insert Table</term>
-	    <listitem>
-	      <para>
-		Inserts a table into the text to help divide two
-		sections.
-	      </para>
-	      <para>
-		To insert a table:
-		<orderedlist numeration="arabic">
-		  <listitem>
-		    <para>
-		      Make sure that you have the
-		      <menuchoice>
-			<guimenu>Format</guimenu>
-			<guimenuitem>HTML</guimenuitem>
-		      </menuchoice>
-                      selector checked.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Click the <guibutton>Table</guibutton> button in the <guilabel>Toolbar</guilabel>.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Select the table <guibutton>Template</guibutton>
-                    you wish to use.  Each has a slightly different feel and
-                    layout.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-                      If you so desire, you may change the number of
-                      rows, columns, spacing of each cell, and so forth.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Click the <guibutton>Insert</guibutton> button.
-		    </para>
-		  </listitem>
-		</orderedlist>
-	      </para>
-
-                <para>
-                  Once the table is in place, you can right-click on
-                  it and get a list of ways to alter it, such as
-                  changing its background color, expanding it, or
-                  deleting a row or cell.
-                </para>
-	    </listitem>
-	  </varlistentry>
-          <varlistentry>
-            <term>Templates</term>
-            <listitem>
-              <para>
-          <application>Evolution</application> not only allows you to
-	  decorate your email with HTML text and graphics, but
-	  provides you with prebuilt templates for you to use when
-	  making these improvements.  You can use these to emphasize a
-	  point or frame an image in an attractive manner.
-        </para>
-	<para>
-	  To include a template into your HTML based email:
-	  <orderedlist numeration="arabic">
-	    <listitem>
-	      <para>
-		Make sure that the
-		<menuchoice>
-		  <guimenu>
-		    Format
-		  </guimenu>
-		  <guimenuitem>
-		    HTML
-		  </guimenuitem>
-		</menuchoice>
-		selector is checked.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Click the <guibutton>HTML Template</guibutton> button in the 
-		<guilabel>Toolbar</guilabel> or select 		
-		<menuchoice>
-		  <guimenu>
-		  Insert
-		  </guimenu>
-		  <guimenuitem>
-		    HTML Template
-		  </guimenuitem>
-		</menuchoice>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Select the template type in the
-		<guilabel>Template</guilabel> selection box. Your
-		options are <guilabel>Note</guilabel> and
-		<guilabel>Image Frame</guilabel>.  
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Set the size and alignment of the HTML template.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		Click <guibutton>Insert</guibutton> to insert it where the 
-		cursor is.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Click on the text in the template, and enter the text
-		you want to use.
-              </para>
-	      <para>
-		If you have selected an image frame template,
-		right-click on the image and select
-		<guimenuitem>Image</guimenuitem> to select the image
-		you want to place in the frame.
-	      </para>
-	    </listitem>
-	  </orderedlist>
-        </para>
-      </listitem>
-    </varlistentry>
-  </variablelist>
-</para>
-</sect2>
-    
-    <sect2 id="usage-mail-getnsend-fwd">
-        <title>Forwarding Mail</title>
-        <para>
-          The post office forwards your mail for you when you change
-          addresses, and you can forward a letter if it comes to you by mistake.
-          The email <guilabel>Forward</guilabel> button
-          works in much the same way.  It's particularly useful if you
-          have received a message and you think someone else would
-          like to see it.  You can forward a message as an attachment
-          to a new message (this is the default) or
-          you can send it <glossterm linkend="inline">inline</glossterm> as a quoted
-          portion of the message you are sending.  Attachment
-          forwarding is best if you want to send the full, unaltered
-          message on to someone else.  Inline forwarding is best if
-          you want to send portions of a message, or if you have a
-          large number of comments on different sections of the
-          message you are forwarding.  Remember to note from whom the
-          message came, and where, if at all, you have removed or
-          altered content.
-        </para>
-        <para>
-          To forward a message you are reading, press
-          <guibutton>Forward</guibutton> on the toolbar, select
-          <menuchoice> <guimenu>Actions</guimenu>
-          <guimenuitem>Forward</guimenuitem> </menuchoice>, or press
-          <keycombo
-action="simul"><keycap>Ctrl</keycap><keycap>J</keycap></keycombo>.  If
-          you prefer to forward the message <glossterm
-          linkend="inline">inline</glossterm>
-          instead of attached, select <menuchoice>
-          <guimenu>Actions</guimenu> <guimenuitem>Forward
-          Inline</guimenuitem> </menuchoice> from the menu.  Choose an
-          addressee as you would when sending a new message; the
-          subject will already be entered, although you can alter it
-          if you wish.  Enter your comments on the message in the
-          <interface>composition frame</interface>, and press
-          <guibutton>Send</guibutton>.
-        </para>
-      </sect2>
-
-      <sect2 id="usage-mail-getnsend-ettiquette">
-        <title>Seven Tips for Email Courtesy</title>
-        <para>
-
-          <itemizedlist>
-
-            <listitem>
-              <para>
-                 Don't send spam or forward chain mail.  If you must,
-                 watch out for hoaxes and urban legends, and make sure
-                 the message doesn't have multiple layers of
-                 greater-than signs, (&gt;) indicating multiple layers
-                 of careless in-line forwarding.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Always begin and close with a salutation. Say "please"
-                and "thank you," just like you do in real life. You
-                can keep your pleasantries short, but be pleasant!
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                WRITING IN CAPITAL LETTERS MEANS YOU'RE SHOUTING!
-                Don't write a whole message in capital letters.  It
-                hurts people's ears.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-               Check your spelling and use complete sentences. By
-               default, <application>Evolution</application> will put
-               a red line beneath words it doesn't recognize, as you
-               type them.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Don't send nasty emails (flames).  If you get one,
-                don't write back.
-              </para>
-            </listitem>
-	  
-	  <listitem>
-	    <para>
-	      When you reply or forward, include just enough of
-	      the previous message to provide context: not too
-	      much, not too little.
-	    </para>
-	  </listitem>
-
-	  <listitem>
-	    <para>
-	      Don't send spam.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-    </sect2>
-  </sect1>
-  <sect1 id="rsvp-stuff">
-    <title>RSVPs in Mail</title>
-    <para>
-      If you create an event in the calendar component, you can then
-      send invitations to the attendee list through the
-      <application>Ximian Evolution</application> email tool.  The
-      invitation card is sent as an attachment in iCal format.
-    </para>
-    <para>
-      If you click on the attachment button and click the
-      <guibutton>View Inline</guibutton>, <application>Ximian
-      Evolution</application> will show you information about the
-      meeting, and let you respond to the meeting in several ways.
-      Select the response that you would like, and then click the
-      <guibutton>OK</guibutton> button.
-   </para>
-   <para>
-  Your options are:
-      <variablelist>
-	<varlistentry>
-	  <term>Accept</term>
-	  <listitem>
-	    <para>
-	  Select this entry if you will attend the meeting.  When you
-	  click the <guibutton>OK</guibutton> button, the meeting will
-	  be entered into your calendar.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term>Tentatively Accept</term>
-	  <listitem>
-	    <para>
-	  Select this entry if you will probably attend the meeting.
-	  When you click the <guibutton>OK</guibutton> button, the
-	  meeting will be entered into your calendar, but marked as
-	  tentative.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term>Decline</term>
-	  <listitem>
-	    <para>
-	  Select this item if you will be unable to attend the
-	  meeting. The meeting will not be entered into your calendar
-	  when you click the <guibutton>OK</guibutton>, although your
-	  response will be sent to the meeting host if you have
-	  checked the <guilabel>RSVP</guilabel> box.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term>RSVP</term>
-	  <listitem>
-	    <para>
-	     Check this box if you would like your response sent to
-	     the meeting organizers.
-	    </para>
-	  </listitem>
-	</varlistentry>
-     </variablelist>
-    </para>
-  </sect1>
-
-  <sect1 id="usage-mail-subscriptions">
-    <title>Subscription Management</title>
-    <para>
-      Since IMAP folders exist on the server, and opening them or
-      checking them takes time, you need fine-grained control over the
-      way that you use IMAP folders.  That's why
-      <application>Evolution</application> has an IMAP subscriptions
-      manager.  If you prefer to have every mail folder displayed, you
-      can select that option as well. However, if you'd like to choose
-      specific items in your mailbox, and exclude others, you can use
-      the subscription management tool to do that.
-    </para>
-    <para>
-    Here's how:
-      <orderedlist numeration="arabic">
-	
-	<listitem>
-	  <para>
-	   Select
-	   <menuchoice><guimenu>Tools</guimenu><guimenuitem>Subscribe
-	   to Folders</guimenuitem></menuchoice>.
-	  </para>
-	</listitem>
-
-	<listitem>
-	  <para>
-	    If you have accounts on multiple IMAP servers, select the
-	    server where you'd like to manage your
-	    subscriptions. <application>Evolution</application> will
-	    display a list of available files and folders.
-	  </para>
-	</listitem>
-
-	<listitem>
-	  <para>
-            Select a file or folder by clicking on it.  You will want
-            to select at least the <guilabel>INBOX</guilabel>
-            folder. Depending upon the way your IMAP server is
-            configured, the list of available files may include
-            non-mail folders. If it does, you can ignore them.
-	  </para>
-	</listitem>
-
-	<listitem>
-	  <para>
-	    Click the <guibutton>Subscribe</guibutton> to add it to
-	    the subscribed list.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    When you have subscribed to the folders you want, close
-	    the window.
-	  </para>
-	</listitem>
-      </orderedlist>
-    </para>
-  </sect1>
-
-  <sect1 id="encryption">
-    <title>Encryption</title>
-    <sect2 id="encryption-whatis">
-      <title>What is Encryption?</title>
-      <para>
-	Encryption is an ancient method of keeping information safe
-	from prying eyes. <application>Evolution</application> helps
-	you you protect your privacy by using
-	<application>gpg</application>, an implementation of strong
-	<glossterm linkend="public-key-encryption">Public Key
-	Encryption.</glossterm>
-      </para>
-
-	<note id="pub-priv">
-	  <title>Public Key?  Private Key?  What is the difference?</title>
-	  <para>
-	    GPG uses two keys: public and private.  You can give your
-	    public key to anyone you want to receive
-	    encrypted messages, or put it on a public key server so
-	    that people can look it up before contacting you.
-	    <emphasis>Never give your private key to anyone,
-	    ever</emphasis>.  Your private key lets you decrypt any
-	    message encrypted with your public key.
-	  </para>
- 	</note>
-
-      <para>
-        Using encryption takes a bit of forethought.  When you send a
-        message that is encrypted, you must encrypt it using your
-        intended recipient's public key.  To <emphasis>get</emphasis>
-        an encrypted message, you must make sure that the sender has
-        your public key in advance. For signing messages, it's
-        reversed: you encrypt the signature with your private key, so
-        only your public key can unlock it. When you send it, the
-        recipient gets your public key and unlocks the signature,
-        verifying your identity.
-      </para>
-
-      <para>
-	You can use encryption in two different ways:
-        <simplelist>
-          <member>
-             Encrypt the entire message, so that nobody but the recipient can read it.
-          </member>
-          <member>
-            Attach an encrypted signature to a plain text message, so
-            that the recipient can read the message without decrypting
-            it, and only needs decryption to verify the sender's
-            identity. 
-           </member>
-         </simplelist>
-      </para>
-
-	<example> 
-         <title>Sending an Encrypted Message</title>
-	  <para>
-	    Kevin wants to send an encrypted message to his friend
-	    Rachel.  He looks up her public key on a general key
-	    server, and then tells
-	    <application>Evolution</application> to encrypt the
-	    message.  The message now reads "@#$23ui7yr87#@!48970fsd."
-	    When the information gets to Rachel, she decrypts it using
-	    her private key, and it appears as plain text for her to
-	    read.
-	  </para>
-	</example>
-      <tip id="always-sign">
-	<title>Always Sign</title>
-	<para>
-	  You can set <application>Evolution</application> to always sign your email messages:
-	  <orderedlist numeration="arabic">
-	    <listitem>
-	      <para>
-                Select
-                <menuchoice>
-                  <guimenu>Tools</guimenu>
-                  <guimenuitem>Settings</guimenuitem>
-                </menuchoice>, go to the Mail Account settings, and
-                select the account with which you want to use encryption.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Open the <guilabel>Security</guilabel> tab.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Click the <guibutton>Always sign outgoing messages when using this account</guibutton> button.
-	      </para>
-	    </listitem>
-	  </orderedlist>
-	</para>
-      </tip>
-    </sect2>
-
-
-
-    <sect2 id="encryption-keygen">
-      <title>Making Encryption Keys</title>
-      <para>
-        Before you can get or send encrypted mail, you need to
-	generate your public and private keys with GPG. Here's how:
-      </para>
-      <tip>
-	<title>GPG Versions</title>
-	<para>
-	  This manual covers version 1.0.6 of GPG.  If your version is
-	  different, this may not be entirely accurate.  You may find
-	  out your version number by typing in the command: <command>gpg
-	  --version</command>.
-	</para>
-      </tip>
-      <para>
-        <orderedlist numeration="arabic">
-	  <listitem>
-      	   <para>
-            Open a terminal and type <command>gpg --gen-key</command>.
-	  </para>
-         </listitem>
-
-	  <listitem>
-      	   <para> 
-             Choose the default algorithm, "DSA and ElGamal."
-	  </para>
-         </listitem>
-
-	  <listitem>
-      	   <para>
-            Choose a key length. The default, 1024 bits, should be
-            long enough.
-	  </para>
-         </listitem>
-
-	  <listitem>
-      	   <para>
-             Decide if you want your key to expire automatically, and if so, when.
-	  </para>
-         </listitem>
-
-
-	  <listitem>
-      	   <para>
-            Enter your name, email address, and any additional
-            personal information you think is appropriate. Do not
-            falsify this information, because it will be needed to
-            verify your identity later on.
-	  </para>
-         </listitem>
-
-	  <listitem>
-      	   <para>
-             Next, enter your passphrase. It does not have to be the
-             same as your email password or your login password. In
-             fact, it probably shouldn't. Don't forget it. If you lose
-             it, your keys will be useless and you will be unable to
-             decrypt messages sent to you with those keys.
-	  </para>
-         </listitem>
-
-	  <listitem>
-      	   <para>
-             Now, GPG will generate your keys.  This may take awhile,
-             so feel free to do something else while it's
-             happening. In fact, using your computer for something
-             else actually helps to generate better keys, because it
-             increases the randomness in the key generation seeds.
-	  </para>
-         </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	Once the keys are generated, you can view your key information
-        by typing <command>gpg --list-keys</command>.  You should see
-        something similar to this:
-        <programlisting>
-	    /home/you/.gnupg/pubring.gpg
-	    ----------------------------
-	    pub 1024D/32j38dk2 2001-06-20 you &lt;you@your-address.com&gt;
-	    sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]
-	</programlisting>
-      </para>
-      <para>
-         GPG will create one list, or keyring, for your public keys
-         and one for your private keys. All the public keys you know
-         are stored in the file
-         <filename>~/.gnupg/pubring.gpg</filename>. If you want to
-         give other people your key, send them that file.
-      </para>
-      <para>
-          If you wish, you can upload your keys to a key server. Here's
-          how:
-        <orderedlist>
-	  <listitem>
-	    <para>
-              Check your public key ID with <command>gpg
---list-keys</command>. It will be the string after 1024D on the line
-beginning with "pub." In this example, it's 32j38dk2.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	     Enter the command <command>gpg --send-keys --keyserver
-wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
-32j38dk2. You will need your password to do this.
-             </para>
-           </listitem>
-    </orderedlist>
-
-	<note id="why-keyserver">
-	  <title>Why Use a Key Server?</title>
-	  <para>
-	    Key servers store your public keys for you so that your
-	    friends can decrypt your messages.  If you choose not to
-	    use a key server, you can manually send your people public
-	    key, include it in your signature file, or put it on your
-	    own web page. However, it's easier to publish them once,
-	    and then let people download them from a central place when
-	    they want.
-	  </para>
-          <para>
-             If you don't have a key you need to unlock or encrypt a
-             message, you can have your encryption tool set to look it
-             up automatically. If it can't find the key, then you'll
-             get an error message.
-          </para>
-	</note>
-
-      </para>
-    </sect2>
-
-    <sect2 id="encrypt-getting-key">
-      <title>Getting and Using Public Keys</title>
-      <para>
-	To encrypt a message to your someone else you'll need to use
-	their public key in combination with your private key.
-	<application>Evolution</application> does that for you, but
-	you still need to get their key and add it to your keyring.
-     </para>
-     <para>
-        To get public keys from a public key server, enter the
-        command:
-	<command>
-	  gpg --recv-keys --keyserver wwwkeys.pgp.net keyid
-	</command>, substituting "keyid" for your recipient's ID.  You
-	will need to type in your password, and then their ID will
-	automatically be added to your keyring. When you send mail to
-	them, <application>Evolution</application> will allow you to
-	encrypt your messages.
-      </para>
-      <para>
-        If someone sends you their public key directly, save it as a
-        plain text file and enter the command <command>gpg
-        filename</command>. This will add it to your keyring.
-      </para>
-    </sect2>
-
-    <sect2 id="encrypt-evo-integ">
-      <title>Setting up Evolution's Encryption</title>
-      <para>
-	You'll need to open
-	<menuchoice>
-	  <guimenu>Tools</guimenu>
-	  <guimenuitem>Settings</guimenuitem>
-	</menuchoice>
-	and select the <guilabel>Mail Accounts</guilabel> button, then
-	select the account you want to use securely, and click the
-	<guibutton>Edit</guibutton> button. Then, select the
-	<guilabel>Security</guilabel> tab in the account dialog.   In the
-	<guilabel>Security</guilabel> tab is a section labeled
-	<guilabel>Pretty Good Privacy</guilabel>.  Enter your key ID
-	and click <guibutton>OK</guibutton>.  Your key is now
-	integrated into your identity in
-	<application>Evolution</application>.
-      </para>
-      <note>
-	<title>What is my Key ID again?</title>
-	<para>
-	  <application>Evolution</application> requires that you know your key ID.  If you don't remember it, you can find it by typing <command>gpg --list-keys</command> in a console window.  Your key ID will be an eight character string with random numbers and letters.
-	</para>
-      </note>
-    </sect2>
-
-    <sect2 id="encrypt-sending">
-      <title>Sending Encrypted Messages</title>
-      <para>
-	As you know, you can use encryption to hide the entire
-	message, or just to verify your signature. Once you've
-	generated your public and private keys, and have the public
-	keys of the people to whom you want to send mail, here's what
-	to do:
-      </para>
-    </sect2>
-    
-    <sect2 id="sign-msg">
-      <title>Signing a Message</title>
-      <para>
-	To sign a message, choose:
-	<menuchoice>
-	  <guimenu>Security</guimenu>
-	  <guimenuitem>PGP Sign</guimenuitem>
-	</menuchoice>
-	.  You will be prompted for your encryption password.  Once
-	you enter it, click <guibutton>OK</guibutton> and your message
-	will be signed.
-      </para>
-    </sect2>
-      
-      <sect2 id="encrypt-msg">
-	<title>Encrypting a Message</title>
-	<para>
-	  Encrypting a message is very similar to signing a message.
-	  Just choose the menu item
-	  <menuchoice>
-	    <guimenu>Security</guimenu>
-	    <guimenuitem>PGP Encrypt</guimenuitem>
-	  </menuchoice>
-	</para>
-      </sect2>
-      <sect2 id="unencrypting">
-	<title>Unencrypting a Received Message</title>
-	<para>
-	  If you get an encrypted message, you will need to decrypt it
-	  before you read it. Remember, the sender has to have your
-	  public key before they can send you an encrypted message.
-	</para>
-	<para>
-	  When you view the message,
-	  <application>Evolution</application> will ask you for your
-	  PGP password.  Enter it, and the message will be displayed
-	  properly.  
-       </para>
-    </sect2>
-  </sect1>
-</chapter>
diff --git a/help/C/usage-mainwindow.xml b/help/C/usage-mainwindow.xml
deleted file mode 100644
index 7d65fd382a..0000000000
--- a/help/C/usage-mainwindow.xml
+++ /dev/null
@@ -1,1542 +0,0 @@
-<chapter id="usage-mainwindow">
-
-  <title>Getting Started with Ximian Evolution</title>
-
-    <sect1 id="what"> 
-      <title>What is Ximian Evolution, and What Can It Do for Me?</title>
-      <para>
-        Information is useless unless it's organized and accessible;
-        it's hardly even worth the name if you can't look at it and be
-        <emphasis>informed</emphasis>.  The goal of
-        <application>Ximian Evolution</application> is to make the
-        tasks of storing, organizing, and retrieving your personal
-        information easier, so you can work and communicate with
-        others.  That is, it's a highly evolved <glossterm
-        linkend="groupware">groupware</glossterm> program, an integral
-        part of the Internet-connected desktop.
-      </para>
-      <para>
-        In other words, <application>Ximian Evolution</application> is
-        a tool to help you get your work done. It can help you work in
-        a group by handling email, address and other contact
-        information, and one or more calendars.  It can do that on one
-        or several computers, connected directly or over a network,
-        for one person or for large groups.
-      </para>
-
-      <para>
-        With <application>Ximian Evolution</application>, you can
-        accomplish your most common daily tasks faster.  For example, it
-        takes only one or two clicks to enter an appointment or an
-        address card sent to you by email, or to send email to a contact
-        or appointment.  <application>Ximian Evolution</application>
-        makes displays faster and more efficient, so searches are faster
-        and memory usage is lower.  People who get lots of mail will
-        appreciate advanced features like <link
-        linkend="usage-mail-organize-vfolders"><trademark>VFolders</trademark></link>,
-        which let you save searches as though they were ordinary mail
-        folders.
-     </para>
-   </sect1>
-
-   <sect1 id="usage-mainwindow-starting">
-     <title>The First Time you Start Ximian Evolution</title>
-     <para>
-       To start <application>Ximian Evolution</application>, do either
-      of the following: 
-      <itemizedlist>
-      <listitem>
-      <para>
-      Select <menuchoice><guimenu>Programs</guimenu>
-      <guimenuitem>Evolution</guimenuitem> </menuchoice> from your
-      menu panel.
-      </para>
-      </listitem>
-
-      <listitem>
-      <para>
-      Type <command>evolution</command> at the command line.
-      </para>
-      </listitem>
-     </itemizedlist>
-     </para>
- 
-     <para>
-       <note>
-         <title>Command Line Options</title>
-         <para>
-           Evolution has a number of command-line options that you may
-           wish to make use of. You can find the full list by running
-           the commands <userinput>man evolution</userinput> or
-           <userinput>evolution --help</userinput>.  The most
-           important ones are:
-           <itemizedlist>
-             <listitem>
-               <para>
-                 To start Evolution in offline mode: <userinput>evolution --offline</userinput> 
-               </para>
-             </listitem>
-
-             <listitem>
-               <para>
-                 To start Evolution and begin composing a message to the email address you name: <userinput>evolution mailto:joe@somewhere.net</userinput>
-             </para>
-           </listitem>
-
-           <listitem>
-             <para>
-               To make your web browser use Evolution as the default email client, enter <userinput>evolution "%s"</userinput> as the email handler in your web browser or in the GNOME Control Center.
-            </para>
-          </listitem>
-        </itemizedlist>
-      </para>
-    </note>
-  </para>
- <para>
-     The first time you run the program, it will create a directory
-      called <filename>evolution</filename> in your home directory,
-      where it will store all of its local data.  Then, it will open a
-      first-run assistant to help you set up mail accounts and import
-      data from other applications.
-    </para>
-    <para>
-      Using the first-run assistant will take approximately two to
-      five minutes.
-    </para>
-
-    <sect2 id="first-step">
-      <title>Defining Your Identity</title>
-      <para>
-	The Identity window is the first step in the assistant. Here,
-	you will enter some basic personal information.  You can
-	define multiple identities later on with the
-	<menuchoice><guimenu>Tools</guimenu>
-	<guimenuitem>Configure</guimenuitem></menuchoice> tool and
-	clicking the <guibutton>Mail Accounts</guibutton> button.
-	<itemizedlist>
-	  <listitem>
-	    <para>
-	      Full Name: Your full name (Example: John Doe).
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Email Address: Your email address (Example: john@doe.com)
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Reply-To: If you want to have replies sent to another
-	      email address, enter it here (optional).
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Organization: The company where you work, or the
-	      organization you represent when you send email
-	      (optional).
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-    </sect2>
-
-    <sect2 id="second-step">
-      <title>Receiving Email</title>
-      <para>
-        The <guilabel>Receiving Email</guilabel> lets you determine
-	which you will get your email.
-	<itemizedlist>
-	  <listitem>
-	    <para>
-	      Server Type: There are numerous types of servers
-	      from which <application>Ximian Evolution</application>
-	      can fetch your mail.  Ask your system administrator if
-	      you're not sure which of the following are available to
-	      you:
-	      <itemizedlist>
-
-		<listitem>
-		  <para>
-		    POP: Downloads your email to your hard disk for
-		    permanent storage.
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Microsoft Exchange: Available only if you have
-		    purchased the Ximian Connector for Microsoft
-		    Exchange, this will allow you to connect to a
-		    Microsoft Exchange 2000 server, which stores
-		    email, calendar, and contact information on the
-		    server. 
-		  </para>
-		</listitem>
-
-
-		<listitem>
-		  <para>
-		    IMAP: Keeps the email on your server so you can
-		    access your email from multiple systems.
-		  </para>
-		</listitem>
-
-		<listitem>
-		  <para>
-		    Standard Unix mbox spool or directory: If you want
-		    to read and store mail in the mail spool on your
-		    local system, choose this option. You'll need to
-		    provide the path to the mail spool
-		    you want to use.
-		  </para>
-		</listitem>
-
-		<listitem>
-		  <para>
-		    Maildir format mail directories: If you download
-		    your mail using qmail or another maildir-style
-		    program, you'll want to use this option.  You'll need
-		    to provide the path to the mail directory you want to
-		    use.
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    MH format mail directories: If you download your
-		    mail using mh or another MH-style program, you'll
-		    want to use this option.  You'll need to provide
-		    the path to the mail directory you want to use.
-		  </para>
-		</listitem>
-
-		<listitem>
-		  <para>
-		    Local Delivery: Choose this option if you want to
-		    move mail from the spool and store it in your home
-		    directory. If you would rather leave mail in your
-		    system's spool files, choose the
-		    <guimenuitem>Standard Unix mbox
-		    spools</guimenuitem> option instead. You'll need
-		    to provide the path to the mail spool you want to
-		    use.
-		  </para>
-		</listitem>
-
-		<listitem>
-		  <para>
-		    None: Select this if you do not plan to
-		    check mail with this account.
-		  </para>
-		</listitem>
-	      </itemizedlist>
-
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-      <para>
-        If you selected POP, Microsoft Exchange, or IMAP as your mail
-        server, you'll need to enter some more information:
-      </para>
-                     <itemizedlist>
-		      <listitem>
-			<para>The host name of your mail server. Ask
-			your system administrator if you're not
-			sure.</para>
-		      </listitem>
-
-		      <listitem>
-			<para>The username for the account on that
-			system. </para>
-		      </listitem>
-
-		      <listitem>
-			<para>Whether you want to use a secure (SSL)
-			connection. If your server supports it, it's
-			best to enable this security option.
-			</para>
-		      </listitem>
-
-		      <listitem>
-			<para>The authentication options supported by
-			your server. If you're not sure, click the
-			<guilabel>Check for supported types</guilabel>
-			button or ask your system administrator.
-			</para>
-		      </listitem>
-
-		      <listitem>
-			<para>Whether you'd like Evolution to remember
-			your password.
-			</para>
-		      </listitem>
-		    </itemizedlist>
-      <tip id="exchange-info">
-	<title>Ximian Evolution Talk to Microsoft Exchange?</title>
-         <para>
-	   If you have purchased Ximian Connector for Microsoft
-	   Exchange, you can access Microsoft Exchange 2000 servers
-	   natively.  If you do not have the Connector, or if you use
-	   an older version of Microsoft Exchange, talk to your system
-	   administrator about access to standard protocol services
-	   like POP and IMAP.
-	</para>
-      </tip> 
-
-    </sect2>
-    <sect2 id="more-mail-options">
-      <title>More Mail Configuration Options</title>
-      <para>
-        There are more extensive options for mail preferences,
-        especially if you've chosen POP, Microsoft Exchange, or IMAP
-        as incoming mail server type.  If you want to set these
-        options after you've created the account, you can select
-        <menuchoice><guimenu>Tools</guimenu> <guimenuitem>Configure
-        </guimenuitem></menuchoice>, click the <guibutton>Mail
-        Accounts</guibutton> button. Then, select the account you want
-        to change and click <guibutton>Edit</guibutton>. See <xref
-        linkend="config-prefs-mail"/> for details.
-      </para>
-        <variablelist>
-	 <varlistentry>
-	  <term>If you chose POP mail:</term>
-	  <listitem><para>
-         <itemizedlist>
-	  <listitem>
-	    <para>Checking for new mail: If you would like
-	    <application>Evolution</application> to check for new mail
-	    automatically, check the box and select a frequency in
-	    minutes.
-            </para>
-	  </listitem>
-
-	  <listitem>
-	    <para>
-              Message Storage: If you'd like to store copies of your
-	    mail on the server, check this option.
-            </para>
-	  </listitem>
-	</itemizedlist>
-           </para>
- 	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term>If you chose Microsoft Exchange:</term>
-	  <listitem><para>
-        <itemizedlist> <listitem>
-	    <para>Checking for new mail: If you would like
-	    <application>Evolution</application> to check for new mail
-	    automatically, check the box and select a frequency in
-	    minutes.
-            </para>
-	  </listitem>
-
-	  <listitem>
-	    <para>Mailbox Name is Different from Login Name: If your active directory user name
-	    is different from your Exchange mailbox name, check this
-	    box and enter your mailbox name here.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Override Outlook Web Access Path: In most cases,
-	      the URL for web access is
-	      "http://server.company.com/exchange." If your
-	      system has a path that is not "exchange," check
-	      the box and enter the custom path here.
-	     </para>
-	  </listitem>
-	  <listitem>
-	    <para>Create a Global Address List folder: If you want to
-	    use your organization's Active Directory or Global Address
-	    List, leave this box checked. </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-              Active Directory Server Name: Enter the Active Directory
-	      server name here.
-            </para>
-	  </listitem>
-
-	  <listitem>
-	    <para>Limit number of Responses: Select a maximum number
-	    of results for an address search. A maximum number of
-	    results limits the load on your system and on your network.
-              </para>
-	  </listitem>
-	</itemizedlist>
-            </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term>If you chose IMAP:</term>
-	  <listitem>
-	    <para>
-         <itemizedlist>
-	  <listitem>
-	    <para>Checking for new mail: If you would like
-	    <application>Evolution</application> to check for new mail
-	    automatically, check the box and select a frequency in
-	    minutes.  
-            </para>
-	  </listitem>
-
-	  <listitem>
-	    <para>If you want <application>Evolution</application>
-	    to check for new messages in <emphasis>all</emphasis> your
-	    IMAP folders, make sure the <guilabel>Check for new
-	    messages in all folders</guilabel> box is selected.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>Show only subscribed folders: Check this box if you
-	    have more folders in your IMAP view than you want to
-	    read.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>
-              Override server-supplied namespace: If you like, enter a
-              specific directory where your server stores mail for
-              you.  Typical values are "mail" and "Mail."  For more
-              information about how to use IMAP mail, see <xref
-              linkend="usage-mail-subscriptions"/>.</para>
-	  </listitem>
-
-	  <listitem>
-	    <para>Apply filters to new messages in INBOX on this
-	    server: If you'd like your filters to work on this account
-	    as well as on locally downloaded mail, check this box.</para>
-	  </listitem>
-	</itemizedlist>
-     </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-
-         <note id="imap-namespace">
-            <title>What's an IMAP Namespace?</title>
-                <para>
-                    For IMAP mail servers, your sysadmin may provide
-		    you with a specific namespace, the directory on
-		    where your server stores mail for you. If you
-		    check your IMAP mail and your folder list includes
-		    files that don't look like mail folders, you
-		    probably need to change your mail
-		    namespace. Typical values are "mail" and "Mail."
-		    If you prefer, you can choose to subscribe to
-		    individual mail folders one at a time. For more
-		    information about how to use IMAP mail, see <xref
-		    linkend="usage-mail-subscriptions"/>.
-               </para>
-             </note>
-
-    </sect2>
-
-    <sect2 id="third-step">
-      <title>Sending Email</title>
-      <para>
-	The <guilabel>Sending Email</guilabel> step lets you configure sending 
-	email.
-	<itemizedlist>
-	  <listitem>
-	    <para>
-	      Server Type: There are numerous server types that
-	      <application>Ximian Evolution</application> supports for sending your
-	      mail.
-	      <itemizedlist>
-		<listitem>
-		  <para>
-		    SMTP: Sends mail directly from your system.
-		  </para>
-		</listitem>
-
-		<listitem>
-		  <para>
-		    Microsoft Exchange: Sends mail through a Microsoft
-		    Exchange server using the Microsoft Exchange 2000
-		    protocol. Available only if you have are using the
-		    Ximian Connector for Microsoft Exchange. You must
-		    have a valid license key purchased from <ulink
-		    url="http://store.ximian.com">store.ximian.com</ulink>.
-		  </para>
-		</listitem>
-
-		<listitem>
-		  <para>
-		    Sendmail: Uses the Sendmail program to send mail
-		    from your system. Sendmail is more flexible, but
-		    is not as easy to configure, so you should only
-		    select this option if you know how to set up a
-		    Sendmail service.
-		  </para>
-		</listitem>
-	      </itemizedlist>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Host: If you chose <guilabel>SMTP</guilabel> or
-	      <guilabel>Microsoft Exchange</guilabel>, enter the
-	      server's name or IP address here.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Server requires authentication: If your server
-	      requires you to enter a password to send mail, check
-	      this box.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Authentication Type: Unless you've been told otherwise,
-	      your best bet is to leave this set at
-	      <guilabel>Password</guilabel>.  If you're not sure, ask
-	      your system administrator or ISP, or have
-	      <application>Ximian Evolution</application> check for
-	      you by clicking <guibutton>Check for supported
-	      types</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Username: The account name you use when you login to
-	      check your email.  Normally, this is the part of your
-	      email address before the '@' character. For Exchange
-	      servers, it is the username you would use to log in to a
-	      Windows workstation at your company.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Remember Password: If you prefer to not enter
-	      your password every time you check email, press this
-	      button.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-    </sect2>
-
-    <sect2 id="step-three-b">
-      <title>Account Management</title>
-      <para>
-        This is a very short section. You can pick two things: the
-        name for the account, and whether it is the default account.
-      </para>
-      <para>
-        The name you choose for the account is used for display within
-        Evolution, and is not sent with any emails.  The suggested
-        name is your email address, but you can use other words or
-        phrases, like "Work," "Personal" or "First Account" if you
-        like.
-      </para>
-      <para>
-        If you check the box next to the label <guilabel>Make this my
-      default account</guilabel>, Evolution will assume that you will
-      send messages from this most often, and will set the
-      "From" selector to this account whenever you open a new message. Only one account can be the default.
-    </para>
-    <para>
-      If you have not done so already, you may also be asked to choose
-      a time zone.
-    </para>
-  </sect2>
-
-  <sect2 id="fourth-step">
-      <title>Importing Mail (Optional)</title>
-      <para>
-	If <application>Ximian Evolution</application> finds mail or
-	address files from another application, it will offer to
-	import them.  If you're not sure which file format your mail
-	program uses, ask your system administrator.  If you want, you
-	can skip this step and return to it at a later time by
-	selecting
-	<menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice>.
-      </para>
-      <para>
-	<application>Ximian Evolution</application> can import the following types of
-	files:
-          <variablelist>
-           <varlistentry>
-	    <term>VCard (.vcf, gcrd):</term>
-	    <listitem>
-	      <para>
-	         The addressbook format used by the GNOME, KDE, and
-	         many other contact management applications. You
-	         should be able to export to VCard format from any
-	         address book application.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Microsoft Outlook Express 4 (.mbx):</term>
-	    <listitem>
-	      <para>
-                 Email file format used by Microsoft Outlook Express
-4. For other versions of Microsoft Outlook and Outlook Express, see
-the workaround described in the note below.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>MBox (mbox):</term>
-	    <listitem>
-	      <para>
-	       The email box format used by Mozilla, Netscape,
-	       Ximian Evolution, Eudora, and many other email clients.
-  	     </para>
-	    </listitem>
-	  </varlistentry>
-       </variablelist>
-</para>
-<para>
-    <note>
-      <title>Microsoft Outlook and Outlook Express Users</title>
-      <para>
-	Microsoft Outlook, and versions of Outlook Express after
-	version 4, use proprietary formats that <application>Ximian
-	Evolution</application> cannot read or import.  For contacts,
-	you may have to email them to yourself and import them that
-	way.  For email, there is a simpler workaround:
-	<orderedlist numeration="arabic">
-
-	<listitem>
-	<para>
-	  While using Windows, import the files into Mozilla Mail (or
-	  another mailer, such as Netscape or Eudora, that uses the
-	  standard mbox format).
-        </para>
-        </listitem>
-	
-	<listitem>
-	<para>
-          Copy the files to the system or partition you use for
-          <application>Ximian Evolution</application>.  
-         </para>
-        </listitem>
-
-	<listitem>
-	<para>
-	  Use the <application>Ximian Evolution</application> import
-          tool to import the files.  There's more information about
-          why this works, and how, at the Ximian <ulink
-          url="http://support.ximian.com">support website.</ulink>
-      </para>
-        </listitem>
-     </orderedlist>
-    </para>
-    </note>     
-
-    <note>
-      <title>Netscape Users</title>
-      <para>
-	Before importing mail from Netscape, make sure you select
-	<menuchoice><guimenu>File</guimenu><guimenuitem>Compact All
-	Folders</guimenuitem></menuchoice>. If you don't,
-	<application>Ximian Evolution</application> will import and undelete
-	the messages in your Trash folders.
-      </para>
-    </note>     
-
-    </para>
-
-      <tip>
-	<title>Exporting Files From Ximian Evolution</title>
-	<para>
-          Ximian Evolution uses standard file types for all its information,
-          so you should have no trouble taking your information
-          elsewhere if you want.
-        </para>
-	<para>
-          For mail, that's <filename>mbox</filename>, for calendar,
-          <filename>iCal</filename>, and for the address book, vCards
-          in a <filename>.db3</filename> database.
-        </para>
-      </tip>
-    </sect2>
-  </sect1>
-
-  <sect1 id="importing-mail-from-clients">
-    <title>Importing Mail from Other Mail Clients</title>
-    <para>
-      Chances are, you already have your email in another mail program
-      and don't want to lose the information.  The following section
-      describes how to import mail from specific mail clients.
-    </para>
-    <sect2 id="mutt">
-      <title>Importing Mail from mutt</title>
-      <para>
-	<application>mutt</application> is a text-based mail client
-	which is shipped with many Linux and Unix distributions.
-	<application>mutt</application> uses the standard mbox,
-	maildir, and MH file formats, which makes importing your mail
-	into <application>Evolution</application> easy.  By default,
-	<application>mutt</application> uses the mbox file format.
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Open <application>Ximian Evolution</application>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click
-	      <menuchoice>
-		<guimenu>File</guimenu>
-		<guimenuitem>Import</guimenuitem>
-	      </menuchoice>
-	      or press
-	      <keycombo action="simul">
-		<keycap>Ctrl</keycap>
-		<keycap>I</keycap>
-	      </keycombo>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>Next</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select <guibutton>Import a Single File</guibutton>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>Browse</guibutton> and select the file
-	      you would like to import from.  By default, your email
-	      is stored in <filename>~/mbox</filename> for the mbox
-	      format and <filename
-	      class="directory">~/Maildir</filename> for the Maildir format.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      When prompted for what folder in
-	      <application>Evolution</application> to import to,
-	      select a folder.  You can also create a new folder and
-	      drop it in there.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-    <sect2 id="kmail">
-      <title>Importing Mail from KMail</title>
-      <para>
-	KMail is the mail client which is shipped with the KDE desktop
-	environment.  KMail uses the standard mbox file format, which
-	means that importing your mail into
-	<application>Evolution</application> is easy.
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Open <application>Ximian Evolution</application>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click
-	      <menuchoice>
-		<guimenu>File</guimenu>
-		<guimenuitem>Import</guimenuitem>
-	      </menuchoice>
-	      or press
-	      <keycombo action="simul">
-		<keycap>Ctrl</keycap>
-		<keycap>I</keycap>
-	      </keycombo>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>Next</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select <guibutton>Import a Single File</guibutton>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>Browse</guibutton> and select the file
-	      you would like to import from.  By default, KMail stores
-	      its information in the Mail directory of your home
-	      directory.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      When prompted for what folder in
-	      <application>Evolution</application> to import to,
-	      select a folder.  You can also create a new folder and
-	      drop it in there.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-  </sect1>
-  
-  <sect1 id="ui-intro">
-    <title>What's What in Ximian Evolution</title>
-    <para>
-        Now that you've gotten the first-run configuration out of the
-        way, you're ready to get down to work.  Here's a quick
-        explanation of what's going on in your main
-        <application>Ximian Evolution</application> window.
-    </para>
-
-    <figure id="preface-basic-interface">
-      <title>The Ximian Evolution Main Window</title>
-      <screenshot>
-	<screeninfo>Inbox</screeninfo>
-	  <mediaobject>
-             <imageobject>
-                 <imagedata fileref="figures/mainwindow-pic" format="PNG" srccredit="Kevin Breit"/> 
-             </imageobject>
-          </mediaobject>
-      </screenshot>
-    </figure>
-    
-    <para>
-      <inlinemediaobject>
-        <imageobject>
-          <imagedata  fileref="figures/full-1" format="PNG"/></imageobject></inlinemediaobject>
-      <guilabel>Menu Bar</guilabel>
-    </para>
-    
-    <para>
-      The <guilabel>menu bar</guilabel> gives you access to nearly all
-      the features that can be found in <application>Ximian
-      Evolution</application>.
-    </para>
-
-    <para>
-      <inlinemediaobject><imageobject><imagedata  fileref="figures/full-2" format="PNG"/></imageobject></inlinemediaobject>
-      <guilabel>Toolbar</guilabel>
-    </para>
-
-    <para>
-      The <guilabel>Toolbar</guilabel> gives you fast and easy access to the
-      most used features in each component.
-    </para>
-    
-    <para>
-      <inlinemediaobject><imageobject><imagedata  fileref="figures/full-3" format="PNG"/></imageobject></inlinemediaobject>
-      <guilabel>Shortcut Bar</guilabel>
-    </para>
-    
-    <para>
-      The <guilabel>Shortcut Bar</guilabel> lets you go to your favorite
-      components with the click of a click of a button.  
-    </para>
-    
-    <para>
-      <inlinemediaobject><imageobject><imagedata  fileref="figures/full-4" format="PNG"/></imageobject></inlinemediaobject>
-      <guilabel>Status Bar</guilabel>
-    </para>
-    
-    <para>
-      Periodically, <application>Ximian Evolution</application> will need to quietly
-      display a message, or tell you the progress of a task.  This most
-      often happens when you're checking or sending email.  These progress
-      queues are shown here, in the <guilabel>Status Bar</guilabel>.  
-    </para>
-    
-    <para>
-      <inlinemediaobject><imageobject><imagedata  fileref="figures/full-5" format="PNG"/></imageobject></inlinemediaobject>
-      <guilabel>Search Tool</guilabel>
-    </para>
-    
-    <para>
-      The <guilabel>Search Tool</guilabel> lets you search through your email
-      with precision so you can easily find what you're looking for.
-    </para>
-
-
-  <sect2 id="usage-mainwindow-shortcutbar">
-    <title>The Shortcut Bar</title>
-    <para>
-        <application>Ximian Evolution</application>'s most important job is
-        to give you access to your information and help you use it
-        quickly.  One way it does that is through the
-        <interface>shortcut bar</interface>, the column on the left
-        hand side of the main window.  The large buttons with names
-        like <guilabel>Inbox</guilabel> and
-        <guilabel>Contacts</guilabel> are the shortcuts, and you can
-        select different groups of shortcuts by clicking the
-        rectangular group buttons.
-    </para>
-    <para>
-       Take a look at the <guilabel>Shortcut Bar</guilabel>
-       The shortcut buttons in that category are:
-
-	    <variablelist>
-	      <varlistentry>
-		<term> <guibutton>Summary</guibutton>:</term>
-		<listitem>
-	    <para>
-		    Start your day here.  The Ximian Evolution
-		    <guilabel>Summary</guilabel> gives you a quick
-		    summary of new or important messages, daily
-		    appointments and urgent tasks.  You can customize
-		    its appearance and content, and use it to access
-		    Ximian Evolution services.
-		  </para>
-		</listitem>
-	      </varlistentry>
-
-	<varlistentry>
-	  <term> <guibutton>Inbox</guibutton>:</term>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Inbox</guibutton> button to start
-	      reading your mail.  Your Inbox is also where you can
-	      access Ximian Evolution's tools to filter, sort, organize, and
-	      search your mail.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><guibutton>Calendar</guibutton>:</term>
-	  <listitem>
-	    <para>
-	      The Calendar can store your appointments and task lists
-	      for you.  Connected to a network, you can use it to keep
-	      a group of people on schedule and up to date.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-       <varlistentry>
-         <term><guibutton>Tasks</guibutton>:</term>
-	<listitem>
-	  <para>
-	     A full-size view of your calendar's task pad.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-	<varlistentry>
-	  <term><guibutton>Contacts</guibutton>:</term>
-	  <listitem>
-	    <para>
-	      The Addressbook holds contacts, with address, phone, and
-	      other personal information. Like calendar information,
-	      contact data can be synchronized with hand-held devices
-	      and shared over a network.
-	   </para>
-	  </listitem>
-	</varlistentry>	  
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="usage-mainwindow-folderbar">
-    <title>Folders and The Folder Bar</title>
-    <para>
-      The <interface>folder bar</interface> is a more comprehensive
-      way to view the information you've stored with
-      <application>Ximian Evolution</application>. It displays all your
-      appointments, address cards, and email in a tree that's a lot
-      like a <glossterm linkend="filetree">file
-      tree</glossterm>-- it starts small at the top, and branches
-      downward. On most computers, there will be three or four
-      folders at the base.  First, of course, is the
-      <guilabel>Summary</guilabel>, a customizable summary of your
-      information. Below that are your <guilabel>Local
-      Folders</guilabel>, which hold all the
-      <application>Ximian Evolution</application> data that's stored on your
-      computer.  After that are your network servers: <glossterm
-      linkend="ldap">LDAP</glossterm> servers that host shared contact
-      directories, and <glossterm linkend="imap">IMAP</glossterm> mail
-      folders to which you subscribe.  Lastly, there are
-      <guilabel>vFolders</guilabel>, or virtual folders, discussed in
-      <xref linkend="usage-mail-organize-vfolders"/>,
-    </para>
-    <para>
-       
-      A typical <guilabel>Local</guilabel> folder contains the following folders:
-      <itemizedlist>
-	 <listitem>
-	    <para>
-	     <guilabel>Calendar</guilabel>, for appointments and
-	     event listings.
-	   </para>
-	 </listitem> 
-	 <listitem>
-	    <para>
-	    <guilabel>Contacts</guilabel>, for address cards.
-	   </para>
-	 </listitem>
-         <listitem>
-	    <para>
-	    <guilabel>Drafts</guilabel>, for messages you started and didn't finish.
-	   </para>
-	 </listitem>
-	 <listitem>
-	    <para>
-	     <guilabel>Inbox</guilabel>, for incoming mail. 
-	   </para>
-	 </listitem>
-
-	<listitem>
-	   <para>
-	    <guilabel>Outbox</guilabel>, for messages you have written
-	    but not yet sent.  This will be empty unless you use
-	    <application>Ximian Evolution</application> while offline.
-	   </para>
-	 </listitem>
-
-	<listitem>
-	   <para>
-	    <guilabel>Sent</guilabel>, for sent mail.
-	   </para>
-	 </listitem>
-
-	<listitem>
-	   <para>
-	    <guilabel>Tasks</guilabel>, for your task list. Portions
-            of your task list are reflected in the calendar, as well
-            as in the summary folder.
-	   </para>
-	 </listitem>
-
-	<listitem>
-	    <para>
-	    <guilabel>Trash</guilabel>, a vFolder view of all the
-	    messages you have marked for deletion but not yet
-	    <glossterm linkend="expunge">expunged</glossterm>.
-	   </para>
-	 </listitem>
-      </itemizedlist>
-
-    </para>
-    <tip id="foldertips">
-    <title>Navigating without the Folder Bar or the Shortcut Bar</title>
-       <para>
-         You don't need the folder bar or the shortcut bar to move
-         around the main window. You can use the <keycap>Tab</keycap>
-         key to switch from one part of the window to another. When
-         you hide the folder bar, there is a menu on the left side of
-         the window just below the toolbar to move about the folder
-         tree, even with the folder and shortcut bars hidden.
-       </para>
-     </tip>
-
-    <para>
-       If you get large volumes of mail, you'll want more folders than
-       just your Inbox.  To create a new folder:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select
-	      <menuchoice> <guimenu>File</guimenu>
-		<guisubmenu>New</guisubmenu>
-		<guimenuitem>Folder</guimenuitem></menuchoice>
-	or press the keyboard shortcut 
-                <keycombo action="simul">
-		<keycap>Shift</keycap>
-		<keycap>Ctrl</keycap>
-		<keycap>E</keycap>
-	      </keycombo>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the name of the folder in the <guilabel>Folder
-		Name</guilabel> field.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the folder type.  The available options are.
-	      <itemizedlist>
-		<listitem>
-		  <para>
-		    Calendar
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Contacts
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Mail
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Tasks
-		  </para>
-		</listitem>
-	      </itemizedlist>
-
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Choose the location of the new folder.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    
-    <sect3 id="subfolders">
-    <title>Subfolders</title>
-      <para>
-        <application>Ximian Evolution</application> lets you nest folders
-	inside of each other, so that you can have a detailed
-	organizational system.
-      </para>
-
-       <note>
-	  <title>Folders Have Limits</title>
-	  <para>
-              Calendars must go in calendar folders, mail in mail
-	      folders, and contacts in contact folders.
-           </para>
-	</note>
-
-    <para>
-      Right-clicking will bring up a menu for just about anything in
-      <application>Ximian Evolution</application>.  If you right-click on a
-      folder, you'll have a menu with the following options:
-      <itemizedlist>
-	<listitem><para><guimenuitem>View</guimenuitem>, to view the folder. </para></listitem>
-	<listitem><para><guimenuitem>Open in New Window</guimenuitem> to view the folder in another window. </para></listitem>
-	<listitem><para><guimenuitem>Move</guimenuitem>, to move the folder to another location. </para></listitem>
-	<listitem><para><guimenuitem>Copy</guimenuitem>, to duplicate the folder. </para></listitem>
-	<listitem><para><guimenuitem>Delete</guimenuitem>, to delete the folder and all its contents. </para></listitem>
-	<listitem><para><guimenuitem>Rename</guimenuitem>, to change its name. </para></listitem>
-	<listitem><para><guimenuitem>Create New Folder</guimenuitem>, to create another folder in the same location. </para></listitem>
-	<listitem><para><guimenuitem>Add to Shortcut Bar</guimenuitem>, to add the folder to your shortcut bar. </para></listitem>
-	<listitem><para><guimenuitem>Properties</guimenuitem>, to view or change the folder properties. </para></listitem>
-      </itemizedlist>
-    </para>
-    <para>
-      You can also rearrange folders and messages by dragging and
-      dropping them.
-    </para>
-
-	<para>
-	  Any time new mail arrives in a mail folder, that folder
-	  label is displayed in bold text, along with the number of
-	  new messages in that folder.
-	</para>
-      </sect3>
-    </sect2>
-    
-    <sect2 id="usage-mainwindow-menubar">
-    <title>The Menu Bar</title>
-    <para>
-      The <interface>menu bar</interface>'s contents will always
-      provide all the possible actions for any given view of your
-      data.  If you're looking at your Inbox, most of the menu items
-      will relate to mail; some will relate to other components of
-      <application>Ximian Evolution</application> and some, especially those
-      in the <guimenu>File Menu</guimenu> will relate to the
-      application as a whole. 
-   </para> 
-   <para>
-      <variablelist>
-        <varlistentry>
-          <term> <guimenu>File</guimenu>:</term>
-
-          <listitem><para> Anything related to a file or to the
-            operations of the application generally falls under this
-            menu: creating things, saving them to disk, printing them,
-            and quitting the program itself.  </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>Edit</guimenu>:</term>
-          <listitem><para>
-              The <guimenu>Edit</guimenu> menu holds
-              useful tools that help you edit text and move it around.
-          </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>View</guimenu>:</term>
-          <listitem><para>
-            This menu lets you decide how <application>Ximian Evolution</application> 
-            should look. Some of the features control the appearance of 
-            <application>Ximian Evolution</application> as a whole, and others 
-            the way a particular kind of information appears.
-          </para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term> <guimenu>Actions</guimenu>:</term>
-          <listitem><para>
-	    Holds actions which maybe applied to a message.  Normally,
-	    if there is only one target for the action -- for
-	    example, replying to a message -- you can find it in
-	    the <guimenu>Actions</guimenu> menu.
-          </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>Tools</guimenu>:</term>
-          <listitem><para>
-             Tools for configuring, changing, and
-          setting up  go here.  For mail, that means things like
-           and the
-          <guimenuitem>Virtual Folder Editor</guimenuitem>.  For the
-          <interface>Calendar</interface> and the <interface>Contact
-          Manager</interface>, it's color, network, and layout
-          configuration.
-          </para></listitem>
-        </varlistentry>
-
-
-
-       <varlistentry>
-          <term> <guimenu>Search</guimenu>:</term>
-          <listitem><para>
-             Select menu items here to search for messages, or for
-          phrases within a message. You can also see previous searches
-          you have made.  In addition to the <guimenu>Search</guimenu>
-          menu, there is a text entry box in the toolbar that you can
-          use to search for messages.
-          </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>Help</guimenu>:</term>
-          <listitem><para>
-             Select among these items to open the 
-             <application>Help Browser</application> 
-             and read the <application>Ximian Evolution</application> manual.
-          </para></listitem>
-        </varlistentry>
-      </variablelist>
-   </para>
-
-   <para>
-      Once you've familiarized yourself with the <interface>main
-      window</interface> you can start doing things with it.  We'll
-      start with the <guilabel>Summary</guilabel>, which provides a
-      quick overview of your <application>Ximian
-      Evolution</application> information.
-    </para>
-    </sect2>
-    <sect2 id="basics-summary">
-      <title>Introducing the Summary</title>
-      <para>
-         The Ximian Evolution Summary provides you with a quick
-         run-down of important information: your appointments for a
-         given day, how much new mail you have, headlines from
-         selected news services, and so forth. To see the Summary,
-         click on the <guibutton>Summary</guibutton> button in the
-         shortcut bar, or select the <guilabel>Summary</guilabel>
-         folder in the folder bar.
-      </para>
-
-      <figure>
-	<title>The Evolution Summary</title>
-        <screenshot>
-          <screeninfo>The Evolution Summary gives you a quick view of your day</screeninfo>
-          <mediaobject>
-            <imageobject>
-              <imagedata  format="PNG" fileref="figures/summary" srccredit="Kevin Breit"/>
-            </imageobject>
-          </mediaobject>
-        </screenshot>
-      </figure>
-
-<para>
-<inlinemediaobject><imageobject><imagedata fileref="figures/full-1" format="PNG"/></imageobject></inlinemediaobject> <guilabel>Weather Summary</guilabel>
-</para>
-<para>
-Shows you the latest weather updates from hundreds of cities around the world.
-</para>
-<para>
-<inlinemediaobject><imageobject><imagedata fileref="figures/full-2" format="PNG"/></imageobject></inlinemediaobject> <guilabel>News Feeds</guilabel>
-</para>
-<para>
-Displays up to the minute news from your favorite websites.
-</para>
-<para>
-<inlinemediaobject><imageobject><imagedata fileref="figures/full-3" format="PNG"/></imageobject></inlinemediaobject> <guilabel>Mail Summary</guilabel>
-</para>
-<para>
-Shows you how many email messages you have in your selected folders, waiting to be read.
-</para>
-<para>
-<inlinemediaobject><imageobject><imagedata fileref="figures/full-4" format="PNG"/></imageobject></inlinemediaobject> <guilabel>Calendar Summary</guilabel>
-</para>
-<para>
-Shows you your calendar.
-</para>
-<para>
-<inlinemediaobject><imageobject><imagedata fileref="figures/full-5" format="PNG"/></imageobject></inlinemediaobject> <guilabel>Tasks</guilabel>
-</para>
-<para>
-Shows your pending tasks
-</para>
-
-
-      <para>
-        To add additional services to your Summary, or to edit the
-        existing services, select
-        <menuchoice>
-	  <guimenu>Tools</guimenu>
-	  <guimenuitem>Configure</guimenuitem> </menuchoice> and click
-	  the <guibutton>Summary Settings</guibutton> button.
-      </para>
-
-    </sect2>
-
-    <sect2 id="basics-mail">
-      <title>Introducing Email</title>
-      <para>
-         <application>Ximian Evolution</application> email is like other
-         email programs in several ways:
-     <itemizedlist>
-	  <listitem>
-	    <para>
-              It can sort and organize your mail in a wide variety of
-              ways with folders, searches, and filters.
-           </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-              It can send and receive mail in HTML or as plain text,
-              and makes it easy to send and receive multiple file
-              attachments.
-           </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-              It supports multiple mail sources, including <glossterm
-              linkend="imap">IMAP</glossterm>, <glossterm
-              linkend="pop">POP3</glossterm>, and local
-              <filename>mbox</filename> or <filename>mh</filename>
-              spools and files created by other mail programs.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      It lets you guard your privacy with encryption.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-      <para>
-        However, <application>Ximian Evolution</application> has some
-        important differences.  First, it's built to handle very large
-        amounts of mail.  Both the <link
-        linkend="usage-mail-organize-filters">filtering</link> and
-        <link linkend="usage-mail-organize-search">searching</link>
-        functions were built for speed and efficiency on large volumes
-        of mail. There's also the <application>Ximian Evolution</application>
-        <link linkend="usage-mail-organize-vfolders">vFolder</link>,
-        an advanced organizational feature not found in mainstream
-        mail clients.  If you get a lot of mail, or if you keep every
-        message you get in case you need to refer to it later, you'll
-        find this feature especially useful.
-     </para>
-     <para>
-        Here's what the mailer looks like:
-
- <!-- ==============Figure=================================== -->
-
-      <figure id="usage-mail-intro-fig">
-          <title>Ximian Evolution Mail</title>
-          <screenshot>
-            <screeninfo>Inbox</screeninfo>
-            <mediaobject><imageobject><imagedata  fileref="figures/mail-inbox" format="PNG" srccredit="Kevin Breit"/>
-        </imageobject></mediaobject>
-        </screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-</para>
-      <para>
-        <inlinemediaobject><imageobject><imagedata  fileref="figures/full-1"
-        format="PNG"/></imageobject></inlinemediaobject> <guilabel>Message List</guilabel>
-      </para>
-    
-      <para>
-        The <guilabel>Message List</guilabel> displays all the emails
-        that you have.  This includes all your read, unread, and email
-        that is flagged to be deleted.
-      </para>
-
-      <para>
-        <inlinemediaobject><imageobject><imagedata  fileref="figures/full-2"
-        format="PNG"/></imageobject></inlinemediaobject> <guilabel>Email
-        Viewer</guilabel>
-      </para>
-    
-      <para>
-        This is where your email is displayed.
-      </para>
-
-      <para>
-     If you find the <interface>view pane</interface> too small, you can resize
-        the pane, enlarge the whole window, or double-click on the
-        message in the <interface>message list</interface> to have it
-        open in a new window.  To change the sizes of a pane, just click
-        and hold on the divider between the two panes.  Then you can drag
-        up and down to select the size of the panes.
-
-</para>
-<para> Just like with folders, you can right-click on messages in the
-        message list and get a menu of possible actions: you can move,
-        delete, or undelete them, and create filters or vFolders based
-        on them.
-      </para>
-      <para>
-        Most of the mail-related actions you'll want to perform are
-        listed in the <guimenu>Message</guimenu> menu in the menu bar.
-        The most frequently used ones, like
-        <guimenuitem>Reply</guimenuitem> and
-        <guimenuitem>Forward</guimenuitem>, also appear as buttons in
-        the toolbar. Almost all of them are also located in the
-        right-click menu and as keyboard shortcuts, which tend to be
-        faster once you get the hang of them.  You can choose
-        whichever way you like best; the idea is that the software
-        should work the way you want, rather than making you work the
-        way the it does.
-      </para>
-
-       <para>
-         For an in-depth guide to the email capabilities of Ximian
-         Evolution, read <xref linkend="usage-mail"/>.
-      </para>
-    </sect2>
-    <sect2 id="basics-calendar">
-      <title>Introducing the Calendar</title>
-      <para>
-       To begin using the calendar, select
-       <guibutton>Calendar</guibutton> from the <interface>shortcut
-       bar</interface>.  By default, the calendar starts showing
-       today's schedule on a ruled background.  At the upper right,
-       there's a monthly calendar you can use to switch days.  Below
-       that, there's a <guilabel>Task</guilabel> pad, where you can
-       keep a list of tasks separate from your calendar appointments.
-       The day view in the calendar looks like this:
-
-   <!-- ============== Figure ============================= -->
-    <figure id="usage-calendar-fig">
-      <title>Ximian Evolution Calendar View</title>
-      <screenshot>
-	<screeninfo>Ximian Evolution Contact Manager Window</screeninfo>
-	<mediaobject><imageobject><imagedata  fileref="figures/calendar" format="PNG" srccredit="Aaron Weber"/>
-	</imageobject></mediaobject>
-      </screenshot>
-    </figure>
-  <!-- ============== End of Figure ============================= --> 
-
-    </para>
-
-      <para>
-        <inlinemediaobject><imageobject><imagedata  fileref="figures/full-1"
-        format="PNG"/></imageobject></inlinemediaobject> <guilabel>Appointment
-        List</guilabel>
-      </para>
-  
-      <para>
-	The <guilabel>Appointment List</guilabel> is responsible for showing you all of
-	your scheduled appointments, whether they are all day appointments or simply one time
-	appointments that last a half an hour.
-      </para>
-
-      <para>
-	<inlinemediaobject><imageobject><imagedata  fileref="figures/full-2" format="PNG"/></imageobject></inlinemediaobject>
-	<guilabel>Task List</guilabel>
-      </para>
-
-      <para>
-        The <guilabel>Task List</guilabel> compliments the
-        <guilabel>Appointment List </guilabel> as it keeps track of
-        tasks which don't have a time associated with them. Tasks can
-        have complex notes associated with them, and you can also note
-        their completeness on a percentage scale.
-      </para>
-
-      <para>
-	<inlinemediaobject><imageobject><imagedata  fileref="figures/full-3" format="PNG"/></imageobject></inlinemediaobject>
-	<guilabel>Calendar Window</guilabel>
-      </para>
-
-      <para>
-	The <guilabel>Calendar Window</guilabel> has a graphical representation of
-	the calendar, so you can select what days to view in the <guilabel>Appointment
-	List</guilabel>.
-      </para>
-
-      <para>
-          For more information about the calendar
-          read <xref linkend="usage-calendar"/>.
-      </para>
-
-    </sect2>
-    <sect2 id="basics-contacts">
-      <title>Introducing the Address Book</title>
-      <para>
-        The <application>Ximian Evolution</application> address book
-        can handle all of the functions of an address book, phone
-        book, or Rolodex.  Of course, it's a lot easier to update
-        <application>Ximian Evolution</application> than it is to
-        change an actual paper book. <application>Ximian
-        Evolution</application> also allows easy synchronization with
-        hand-held devices and functions with <glossterm
-        linkend="ldap">LDAP</glossterm> directories on a network.
-      </para>
-      <para>
-        Another advantage of the <application>Ximian Evolution</application>
-        address book is its integration with the rest of the
-        application.  For example, you can create an address card from
-        an email just by right-clicking on the sender's email address.
-      </para>
-      <para>
-        To open your address book, click on
-        <guibutton>Contacts</guibutton> in the shortcut bar, or select
-        one of your contacts folders from the folder bar.  <xref
-        linkend="usage-contact-fig"/> shows the address book in all its
-        organizational glory.  By default, the address book shows all
-        your cards in alphabetical order, in a <glossterm
-        linkend="minicard">minicard</glossterm> view.  You can select
-        other views from the <guimenu>View</guimenu> menu, and adjust
-        the width of the columns by clicking and dragging the gray
-        column dividers.
-      </para>
-      <para>
-        The address book looks like this:
-
-      <figure id="usage-contact-fig">
-	<title>Ximian Evolution Contact Interface</title>
-	<screenshot>
-	  <screeninfo>Ximian Evolution Contact List Window</screeninfo>
-	  <mediaobject><imageobject><imagedata  fileref="figures/contact" format="PNG" srccredit="Kevin Breit"/>
-  	  </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-     </para>
-      <para>
-        <inlinemediaobject><imageobject><imagedata  fileref="figures/full-1"
-        format="PNG"/></imageobject></inlinemediaobject> <guilabel>Contact
-        List</guilabel>
-      </para>
-      <para>
-        The <guilabel>Contact List</guilabel> lists your contacts.
-      </para>
-      <para>
-          For detailed instructions on how to use the address book,
-          read <xref linkend="usage-contact"/>.
-      </para>
-    </sect2>
-  </sect1>
-</chapter>
\ No newline at end of file
diff --git a/help/C/usage-print.xml b/help/C/usage-print.xml
deleted file mode 100644
index a9c124e9a0..0000000000
--- a/help/C/usage-print.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<chapter id="usage-print">
-  <title>Printing with Evolution</title>
-  <para>
-    If you've printed from most any other
-    <application>Gnome</application> application, you should be able
-    to print from <application>Evolution</application> without much
-    trouble.
-  </para>
-  <para>
-    Whether you're printing a message, a calendar page, or a selection
-    of address cards, you can choose to print directly to a printer,
-    or save the print output to a <glossterm
-    linkend="postscript">postscript</glossterm> file.  You can also
-    use the preview feature to see how your printed output will look.
-  </para>
-  
-  <sect1 id="printpreview">
-    <title>Print Preview</title>
-    <para>
-      <guibutton>Print Preview</guibutton> appears both as a button in
-      the printing dialog and as an item in the
-      <guimenu>File</guimenu> menu.  In both places, it does the same
-      thing: it opens a new window that shows you what would happen if
-      you were to print the current message, calendar, appointment, or
-      address card.
-    </para>
-    <para>
-      That window allows you to select which pages you want to see,
-      and how close you'd like to look at them.  Zoom in or out, fit
-      the page to the window (the <guibutton>Fit</guibutton> button)
-      or match the width of the page and the window (the
-      <guibutton>Fit Width</guibutton> button).  None of these buttons
-      changes the way the page will be printed, but they do let you
-      get a better look.  If you're satisfied with the way the your paper
-      looks, click <guibutton>Print</guibutton> to send your document
-      on its way.  If you'd like to change it, just close the
-      <guilabel>Print Preview</guilabel> window and make the changes
-      you want from your mail, calendar, or addressbook.
-    </para>
-
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="print-preview">
-	  <title>Print Preview</title>
-	  <screenshot>
-	    <screeninfo>Print Preview</screeninfo>
-	    <mediaobject><imageobject><imagedata fileref="figures/print-preview" format="PNG" srccredit="Aaron Weber"/>
-	</imageobject></mediaobject>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-  </sect1>
-
-  <sect1 id="print-destination">
-    <title>File or Printer?</title>
-    <para>
-       The printer selection window, shown in <xref
-       linkend="print-dest"/>, lets you choose the format for
-       printing-- <guilabel>Generic Postscript</guilabel>,
-       whether to write to a PDF file, and whether to print to a file
-       or to an actual printer in Generic Postscript.  If you choose a
-       printer, you'll be asked for the printer command (probably
-       <guilabel>lpr</guilabel>) which your system uses.  If you
-       choose to print to a file, you'll need to decide upon a
-       filename.  And of course, you'll want to choose a number of
-       copies, and whether to collate them.
-
-	<note id="windows-ps">
-	  <title>Printing to PostScript?</title>
-	  <para>
-           PostScript is the file format used by most laser printers,
-           and in UNIX world is the easiest way to print to a file.
-           However, most systems running Microsoft Windows can't
-           recognize or handle PostScript files.  You'll need to print
-           to PDF if you want to share your file with Windows users.
-	  </para>
-	</note>
-    </para>
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="print-dest">
-	  <title>Choosing a Printer</title>
-	  <screenshot>
-	    <screeninfo>Choosing a Printer</screeninfo>
-	    <mediaobject><imageobject><imagedata fileref="figures/print-dest" format="PNG" srccredit="Aaron Weber"/>
-	</imageobject></mediaobject>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-   <para>
-     If you're printing a message that's more than one page, you'll
-     have the option of choosing which pages to print.  If you're
-     printing a calendar entry, you can decide what range of dates to
-     print.  And, if you're printing contact cards, you can decide
-     whether to print only the selected cards, or all of them.
-   </para>
-    <para>
-      When you're ready, click <guibutton>Print</guibutton> to print,
-      <guibutton>Preview</guibutton> to have a look (or another look)
-      at the preview, or <guibutton>Cancel</guibutton> to cancel the
-      whole deal.
-    </para>
-  </sect1>
-</chapter>
-
-
-
-
-
-
-
diff --git a/help/C/usage-sync.sgml b/help/C/usage-sync.sgml
deleted file mode 100644
index 5b93a65736..0000000000
--- a/help/C/usage-sync.sgml
+++ /dev/null
@@ -1,39 +0,0 @@
-    <chapter id="usage-sync">
-      <title>Synchronizing Evolution with Hand-Held Devices</title>
-      <para>
-        This chapter is very short.  It describes how to synchronize
-        the data on your Palm-OS device with the data you store in
-        <application>Ximian Evolution</application>.  If you need
-        information on how to set up handheld synchronization, consult
-        <xref linkend="config-sync">.
-      </para>
-
-      <sect1 id="hotsync">
-        <title>Using HotSync</title>
-        <para>
-          Put your hand-held device in its cradle and press the
-          HotSync button.
-        </para>
-
-<tip id="sync-tip">
-<title>Palm OS v. 4.0 with Passwords</title>
-<para>
-If you use Palm OS v. 4.0 and have password protection turned on for
-your handheld device, you may encounter trouble synchronizing.  If
-this happens, try turning off password protection on your handheld,
-synchronize it with your desktop computer, and then re-enable password
-protection on your handheld.
-</para>
-</tip>
-        <para>
-	 If you have followed the set up instructions properly, your
-	 Palm-OS device will synchronize data with <application>Ximian
-	 Evolution</application>.
-        </para>
-
-         <para>
-            That's it.
-         </para>
-
-       </sect1>
-    </chapter>
diff --git a/help/C/usage-sync.xml b/help/C/usage-sync.xml
deleted file mode 100644
index 45e18e5e82..0000000000
--- a/help/C/usage-sync.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-    <chapter id="usage-sync">
-      <title>Synchronizing Evolution with Hand-Held Devices</title>
-      <para>
-        This chapter is very short.  It describes how to synchronize
-        the data on your Palm-OS device with the data you store in
-        <application>Ximian Evolution</application>.  If you need
-        information on how to set up handheld synchronization, consult
-        <xref linkend="config-sync"/>.
-      </para>
-
-      <sect1 id="hotsync">
-        <title>Using HotSync</title>
-        <para>
-          Put your hand-held device in its cradle and press the
-          HotSync button.
-        </para>
-
-<tip id="sync-tip">
-<title>Palm OS v. 4.0 with Passwords</title>
-<para>
-If you use Palm OS v. 4.0 and have password protection turned on for
-your handheld device, you may encounter trouble synchronizing.  If
-this happens, try turning off password protection on your handheld,
-synchronize it with your desktop computer, and then re-enable password
-protection on your handheld.
-</para>
-</tip>
-        <para>
-	 If you have followed the set up instructions properly, your
-	 Palm-OS device will synchronize data with <application>Ximian
-	 Evolution</application>.
-        </para>
-
-         <para>
-            That's it.
-         </para>
-
-       </sect1>
-    </chapter>
diff --git a/help/COPYING-DOCS b/help/COPYING-DOCS
deleted file mode 100644
index b42936beb3..0000000000
--- a/help/COPYING-DOCS
+++ /dev/null
@@ -1,355 +0,0 @@
-		GNU Free Documentation License
-		   Version 1.1, March 2000
-
- Copyright (C) 2000  Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-0. PREAMBLE
-
-The purpose of this License is to make a manual, textbook, or other
-written document "free" in the sense of freedom: to assure everyone
-the effective freedom to copy and redistribute it, with or without
-modifying it, either commercially or noncommercially.  Secondarily,
-this License preserves for the author and publisher a way to get
-credit for their work, while not being considered responsible for
-modifications made by others.
-
-This License is a kind of "copyleft", which means that derivative
-works of the document must themselves be free in the same sense.  It
-complements the GNU General Public License, which is a copyleft
-license designed for free software.
-
-We have designed this License in order to use it for manuals for free
-software, because free software needs free documentation: a free
-program should come with manuals providing the same freedoms that the
-software does.  But this License is not limited to software manuals;
-it can be used for any textual work, regardless of subject matter or
-whether it is published as a printed book.  We recommend this License
-principally for works whose purpose is instruction or reference.
-
-
-1. APPLICABILITY AND DEFINITIONS
-
-This License applies to any manual or other work that contains a
-notice placed by the copyright holder saying it can be distributed
-under the terms of this License.  The "Document", below, refers to any
-such manual or work.  Any member of the public is a licensee, and is
-addressed as "you".
-
-A "Modified Version" of the Document means any work containing the
-Document or a portion of it, either copied verbatim, or with
-modifications and/or translated into another language.
-
-A "Secondary Section" is a named appendix or a front-matter section of
-the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall subject
-(or to related matters) and contains nothing that could fall directly
-within that overall subject.  (For example, if the Document is in part a
-textbook of mathematics, a Secondary Section may not explain any
-mathematics.)  The relationship could be a matter of historical
-connection with the subject or with related matters, or of legal,
-commercial, philosophical, ethical or political position regarding
-them.
-
-The "Invariant Sections" are certain Secondary Sections whose titles
-are designated, as being those of Invariant Sections, in the notice
-that says that the Document is released under this License.
-
-The "Cover Texts" are certain short passages of text that are listed,
-as Front-Cover Texts or Back-Cover Texts, in the notice that says that
-the Document is released under this License.
-
-A "Transparent" copy of the Document means a machine-readable copy,
-represented in a format whose specification is available to the
-general public, whose contents can be viewed and edited directly and
-straightforwardly with generic text editors or (for images composed of
-pixels) generic paint programs or (for drawings) some widely available
-drawing editor, and that is suitable for input to text formatters or
-for automatic translation to a variety of formats suitable for input
-to text formatters.  A copy made in an otherwise Transparent file
-format whose markup has been designed to thwart or discourage
-subsequent modification by readers is not Transparent.  A copy that is
-not "Transparent" is called "Opaque".
-
-Examples of suitable formats for Transparent copies include plain
-ASCII without markup, Texinfo input format, LaTeX input format, SGML
-or XML using a publicly available DTD, and standard-conforming simple
-HTML designed for human modification.  Opaque formats include
-PostScript, PDF, proprietary formats that can be read and edited only
-by proprietary word processors, SGML or XML for which the DTD and/or
-processing tools are not generally available, and the
-machine-generated HTML produced by some word processors for output
-purposes only.
-
-The "Title Page" means, for a printed book, the title page itself,
-plus such following pages as are needed to hold, legibly, the material
-this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, "Title Page" means
-the text near the most prominent appearance of the work's title,
-preceding the beginning of the body of the text.
-
-
-2. VERBATIM COPYING
-
-You may copy and distribute the Document in any medium, either
-commercially or noncommercially, provided that this License, the
-copyright notices, and the license notice saying this License applies
-to the Document are reproduced in all copies, and that you add no other
-conditions whatsoever to those of this License.  You may not use
-technical measures to obstruct or control the reading or further
-copying of the copies you make or distribute.  However, you may accept
-compensation in exchange for copies.  If you distribute a large enough
-number of copies you must also follow the conditions in section 3.
-
-You may also lend copies, under the same conditions stated above, and
-you may publicly display copies.
-
-
-3. COPYING IN QUANTITY
-
-If you publish printed copies of the Document numbering more than 100,
-and the Document's license notice requires Cover Texts, you must enclose
-the copies in covers that carry, clearly and legibly, all these Cover
-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
-the back cover.  Both covers must also clearly and legibly identify
-you as the publisher of these copies.  The front cover must present
-the full title with all words of the title equally prominent and
-visible.  You may add other material on the covers in addition.
-Copying with changes limited to the covers, as long as they preserve
-the title of the Document and satisfy these conditions, can be treated
-as verbatim copying in other respects.
-
-If the required texts for either cover are too voluminous to fit
-legibly, you should put the first ones listed (as many as fit
-reasonably) on the actual cover, and continue the rest onto adjacent
-pages.
-
-If you publish or distribute Opaque copies of the Document numbering
-more than 100, you must either include a machine-readable Transparent
-copy along with each Opaque copy, or state in or with each Opaque copy
-a publicly-accessible computer-network location containing a complete
-Transparent copy of the Document, free of added material, which the
-general network-using public has access to download anonymously at no
-charge using public-standard network protocols.  If you use the latter
-option, you must take reasonably prudent steps, when you begin
-distribution of Opaque copies in quantity, to ensure that this
-Transparent copy will remain thus accessible at the stated location
-until at least one year after the last time you distribute an Opaque
-copy (directly or through your agents or retailers) of that edition to
-the public.
-
-It is requested, but not required, that you contact the authors of the
-Document well before redistributing any large number of copies, to give
-them a chance to provide you with an updated version of the Document.
-
-
-4. MODIFICATIONS
-
-You may copy and distribute a Modified Version of the Document under
-the conditions of sections 2 and 3 above, provided that you release
-the Modified Version under precisely this License, with the Modified
-Version filling the role of the Document, thus licensing distribution
-and modification of the Modified Version to whoever possesses a copy
-of it.  In addition, you must do these things in the Modified Version:
-
-A. Use in the Title Page (and on the covers, if any) a title distinct
-   from that of the Document, and from those of previous versions
-   (which should, if there were any, be listed in the History section
-   of the Document).  You may use the same title as a previous version
-   if the original publisher of that version gives permission.
-B. List on the Title Page, as authors, one or more persons or entities
-   responsible for authorship of the modifications in the Modified
-   Version, together with at least five of the principal authors of the
-   Document (all of its principal authors, if it has less than five).
-C. State on the Title page the name of the publisher of the
-   Modified Version, as the publisher.
-D. Preserve all the copyright notices of the Document.
-E. Add an appropriate copyright notice for your modifications
-   adjacent to the other copyright notices.
-F. Include, immediately after the copyright notices, a license notice
-   giving the public permission to use the Modified Version under the
-   terms of this License, in the form shown in the Addendum below.
-G. Preserve in that license notice the full lists of Invariant Sections
-   and required Cover Texts given in the Document's license notice.
-H. Include an unaltered copy of this License.
-I. Preserve the section entitled "History", and its title, and add to
-   it an item stating at least the title, year, new authors, and
-   publisher of the Modified Version as given on the Title Page.  If
-   there is no section entitled "History" in the Document, create one
-   stating the title, year, authors, and publisher of the Document as
-   given on its Title Page, then add an item describing the Modified
-   Version as stated in the previous sentence.
-J. Preserve the network location, if any, given in the Document for
-   public access to a Transparent copy of the Document, and likewise
-   the network locations given in the Document for previous versions
-   it was based on.  These may be placed in the "History" section.
-   You may omit a network location for a work that was published at
-   least four years before the Document itself, or if the original
-   publisher of the version it refers to gives permission.
-K. In any section entitled "Acknowledgements" or "Dedications",
-   preserve the section's title, and preserve in the section all the
-   substance and tone of each of the contributor acknowledgements
-   and/or dedications given therein.
-L. Preserve all the Invariant Sections of the Document,
-   unaltered in their text and in their titles.  Section numbers
-   or the equivalent are not considered part of the section titles.
-M. Delete any section entitled "Endorsements".  Such a section
-   may not be included in the Modified Version.
-N. Do not retitle any existing section as "Endorsements"
-   or to conflict in title with any Invariant Section.
-
-If the Modified Version includes new front-matter sections or
-appendices that qualify as Secondary Sections and contain no material
-copied from the Document, you may at your option designate some or all
-of these sections as invariant.  To do this, add their titles to the
-list of Invariant Sections in the Modified Version's license notice.
-These titles must be distinct from any other section titles.
-
-You may add a section entitled "Endorsements", provided it contains
-nothing but endorsements of your Modified Version by various
-parties--for example, statements of peer review or that the text has
-been approved by an organization as the authoritative definition of a
-standard.
-
-You may add a passage of up to five words as a Front-Cover Text, and a
-passage of up to 25 words as a Back-Cover Text, to the end of the list
-of Cover Texts in the Modified Version.  Only one passage of
-Front-Cover Text and one of Back-Cover Text may be added by (or
-through arrangements made by) any one entity.  If the Document already
-includes a cover text for the same cover, previously added by you or
-by arrangement made by the same entity you are acting on behalf of,
-you may not add another; but you may replace the old one, on explicit
-permission from the previous publisher that added the old one.
-
-The author(s) and publisher(s) of the Document do not by this License
-give permission to use their names for publicity for or to assert or
-imply endorsement of any Modified Version.
-
-
-5. COMBINING DOCUMENTS
-
-You may combine the Document with other documents released under this
-License, under the terms defined in section 4 above for modified
-versions, provided that you include in the combination all of the
-Invariant Sections of all of the original documents, unmodified, and
-list them all as Invariant Sections of your combined work in its
-license notice.
-
-The combined work need only contain one copy of this License, and
-multiple identical Invariant Sections may be replaced with a single
-copy.  If there are multiple Invariant Sections with the same name but
-different contents, make the title of each such section unique by
-adding at the end of it, in parentheses, the name of the original
-author or publisher of that section if known, or else a unique number.
-Make the same adjustment to the section titles in the list of
-Invariant Sections in the license notice of the combined work.
-
-In the combination, you must combine any sections entitled "History"
-in the various original documents, forming one section entitled
-"History"; likewise combine any sections entitled "Acknowledgements",
-and any sections entitled "Dedications".  You must delete all sections
-entitled "Endorsements."
-
-
-6. COLLECTIONS OF DOCUMENTS
-
-You may make a collection consisting of the Document and other documents
-released under this License, and replace the individual copies of this
-License in the various documents with a single copy that is included in
-the collection, provided that you follow the rules of this License for
-verbatim copying of each of the documents in all other respects.
-
-You may extract a single document from such a collection, and distribute
-it individually under this License, provided you insert a copy of this
-License into the extracted document, and follow this License in all
-other respects regarding verbatim copying of that document.
-
-
-7. AGGREGATION WITH INDEPENDENT WORKS
-
-A compilation of the Document or its derivatives with other separate
-and independent documents or works, in or on a volume of a storage or
-distribution medium, does not as a whole count as a Modified Version
-of the Document, provided no compilation copyright is claimed for the
-compilation.  Such a compilation is called an "aggregate", and this
-License does not apply to the other self-contained works thus compiled
-with the Document, on account of their being thus compiled, if they
-are not themselves derivative works of the Document.
-
-If the Cover Text requirement of section 3 is applicable to these
-copies of the Document, then if the Document is less than one quarter
-of the entire aggregate, the Document's Cover Texts may be placed on
-covers that surround only the Document within the aggregate.
-Otherwise they must appear on covers around the whole aggregate.
-
-
-8. TRANSLATION
-
-Translation is considered a kind of modification, so you may
-distribute translations of the Document under the terms of section 4.
-Replacing Invariant Sections with translations requires special
-permission from their copyright holders, but you may include
-translations of some or all Invariant Sections in addition to the
-original versions of these Invariant Sections.  You may include a
-translation of this License provided that you also include the
-original English version of this License.  In case of a disagreement
-between the translation and the original English version of this
-License, the original English version will prevail.
-
-
-9. TERMINATION
-
-You may not copy, modify, sublicense, or distribute the Document except
-as expressly provided for under this License.  Any other attempt to
-copy, modify, sublicense or distribute the Document is void, and will
-automatically terminate your rights under this License.  However,
-parties who have received copies, or rights, from you under this
-License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-
-10. FUTURE REVISIONS OF THIS LICENSE
-
-The Free Software Foundation may publish new, revised versions
-of the GNU Free Documentation License from time to time.  Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.  See
-http://www.gnu.org/copyleft/.
-
-Each version of the License is given a distinguishing version number.
-If the Document specifies that a particular numbered version of this
-License "or any later version" applies to it, you have the option of
-following the terms and conditions either of that specified version or
-of any later version that has been published (not as a draft) by the
-Free Software Foundation.  If the Document does not specify a version
-number of this License, you may choose any version ever published (not
-as a draft) by the Free Software Foundation.
-
-
-ADDENDUM: How to use this License for your documents
-
-To use this License in a document you have written, include a copy of
-the License in the document and put the following copyright and
-license notices just after the title page:
-
-      Copyright (c)  YEAR  YOUR NAME.
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the GNU Free Documentation License, Version 1.1
-      or any later version published by the Free Software Foundation;
-      with the Invariant Sections being LIST THEIR TITLES, with the
-      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
-      A copy of the license is included in the section entitled "GNU
-      Free Documentation License".
-
-If you have no Invariant Sections, write "with no Invariant Sections"
-instead of saying which ones are invariant.  If you have no
-Front-Cover Texts, write "no Front-Cover Texts" instead of
-"Front-Cover Texts being LIST"; likewise for Back-Cover Texts.
-
-If your document contains nontrivial examples of program code, we
-recommend releasing these examples in parallel under your choice of
-free software license, such as the GNU General Public License,
-to permit their use in free software.
diff --git a/help/ChangeLog b/help/ChangeLog
deleted file mode 100644
index bfe823d4f2..0000000000
--- a/help/ChangeLog
+++ /dev/null
@@ -1,2055 +0,0 @@
-2003-04-27  Rodney Dawes  <dobey@ximian.com>
-
-	* C/Makefile.am: Add figures/outline.png to $(figs)
-	
-2003-04-14  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-prefs.xml: Validation, mostly. Change in some ref names.
-
-2003-04-10  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.xml: can't vfolder on arbitrary folders.
-
-2003-04-08  Aaron Weber  <aaron@ximian.com>
-
-	* C/legal.xml: update trademark/copyright hoo-ha.
-
-2003-04-07  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.xml: add flag-for-followup instructions.
-
-2003-03-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am (EXTRA_DIST): Ooops, add omf.make.
-
-2003-03-26  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/evolution-1.4-C.omf: Renamed from evolution-C.omf.
-	* C/evolution-1.4.xml: Renamed from evolution.xml.
-
-	* Makefile.am (SUBDIRS): Remove "no" for now.
-
-	* xmldocs.make: Updated to most recent version on GNOME CVS.
-
-	* C/Makefile.am (docname): Add version.
-	(omffile): Likewise.
-
-2003-03-19  Aaron Weber  <aaron@ximian.com>
-
-	* Makefile.am: s/sgml/xml/ (DOH)
-
-2003-02-19  Aaron Weber  <aaron@ximian.com>
-
-	* C/preface.xml: add a couple "expert tips" that don't really go
-	anywhere else.
-	
-
-2003-02-18  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exchange.xml: replaced image, updated for 1.2 layout
-	(different order, mostly). Changed name of a section for better
-	clarity; this may cause filenames to differ in future builds.
-	
-	* C/figures/exchange-receive-options.png: updated image. 
-
-2003-02-04  Aaron Weber  <aaron@ximian.com>
-
-	* C/apx-authors.xml: thx to Baris, adjust phrasing in assorted
-	places. tiny fixes, basically.
-
-2003-01-30  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.xml: updates from Baris Cicek.
-
-2003-01-15  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.xml:  Change links from  ghelp links to internal apx-fdl or apx-gpl
-
-	* es/evolution.sgml: s/gnome-help/ghelp
-
-	* es/preface.sgml: s/gnome-help/ghelp
-
-2003-01-11  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.xml: "Send Later" feature changed for 1.2 and I
-	didn't notice. Shame on me.
-
-2002-12-16  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-sync.xml: spelling/typos
-
-	* C/usage-exchange.xml: spelling/typos
-
-	* C/usage-mail.xml: spelling/typos
-
-	* C/usage-mainwindow.xml: spelling/typos
-
-2002-12-10  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-prefs.xml: change directory server description.
-
-	* C/preface.xml: typo (bug 35362, "Resend" instead of "Redirect).
-	This whole section will need to be redone at some point.
-	
-2002-12-06  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.xml: add spam filtering help.
-
-2002-11-19  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-prefs.xml: fix typo as per bug 34152
-	
-	* C/legal.xml: redo tags for legalnotice ordering. open/close for
-	actual preface is in evolution.xml and the LEGAL entity
-	(legal.xml) is now part of the preface. the legalnotice tag itself
-	merely says "hey, go look at the preface, legal info is there due
-	to rendering issues."
-
-	* C/apx-gpl.xml: new file. GPL! 
-	
-	* C/Makefile.am: New file: apx-gpl.xml. Re-alphabetize the files
-	listed as entities, and make the \'s line up so it looks pretty.
-
-	* C/preface.xml: redo tags for legalnotice ordering. open/close
-	for actual preface is in evolution.xml and the LEGAL entity
-	(legal.xml) is now part of the preface.
-	
-	* C/evolution.xml: reorder, add GPL, put legalnotice inside
-	preface. Put actual <preface> tags in this file, so that the
-	preface could consist of sect1s which are the &LEGAL; and
-	&PREFACE; entities.
-
-2002-11-11  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-prefs.xml: fix bug 27336, which is about how the Search
-	Base option description is wrong.
-
-2002-11-04  Aaron Weber  <aaron@ximian.com>
-
-	* C/*.sgml: All sgml files replaced with xml files. XML files
-	validated. Two new XML files-- apx-fdl.xml and legal.xml
-
-	* C/evolution-C.omf: Altered to fit the GDP template. This may now
-	work with the GNOME 2.0 DTD, although I could be wrong.
-
-	* sgmldocs.make: removed and replaced with xmldocs.make. This will
-	break all translations until they are also ported to XML. I will
-	probably begin doing that tomorrow, since it's just markup and not
-	language stuff.
-
-	* C/Makefile.am: added two files
-
-2002-10-22  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: Edit-->Undelete, not Actions-->Undelete
-
-2002-10-16  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: no longer need to enter path.
-	
-
-2002-10-15  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exchange.sgml: Update supported/unsupported list.
-
-	* C/topic.dat: Change "What is Evolution" to "Introduction"
-
-	* C/usage-exchange.sgml: typo.
-
-	* C/menuref.sgml: update keycapss.
-
-	* C/usage-mainwindow.sgml: add note about command-line options.
-
-2002-10-11  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.sgml: add note about multiple repeated header
-	definitions as per 31291.
-
-2002-10-08  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exchange.sgml: fix 1.0/1.2 feature list discrepancies.
-
-	* C/preface.sgml: add info about man page and so forth.
-
-	* C/usage-mail.sgml: fix 30892, a cosmetic bug.
-
-2002-09-20  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: offline usage.
-
-	* C/usage-calendar.sgml: linked to wrong image.
-
-2002-09-19  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* C/evolution-C.omf: Make it validate.
-	* es/evolution-es.omf: Same here.
-	
-
-2002-09-19  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-sync.sgml: add item about permissions.
-
-	* C/usage-mail-org.sgml: add note about filter applications, tip
-	for easy filtering.
-
-	* C/usage-mail.sgml: encryption update
-
-2002-08-28  Aaron Weber  <aaron@ximian.com>
-
-	* C/preface.sgml: nav-by-letters
-
-2002-08-23  Aaron Weber  <aaron@ximian.com>
-
-	* C/preface.sgml: remove shortcuts that didn't actually get added
-	to the app.
-
-2002-08-22  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.sgml: change Exchange description
-
-	* C/config-prefs.sgml: add RDF note to newsfeed item.
-
-	* C/preface.sgml: update as per Christine's comments in
-	http://bugzilla.ximian.com/show_bug.cgi?id=29239
-
-2002-07-09  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail-org.sgml: Added note about set status filter action.
-
-2002-06-28  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exec-summary.sgml: change menu item links.
-
-2002-06-27  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution-C.omf: apply patch from owen taylor
-
-2002-06-26  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-contact.sgml: remove the search-refining feature, which
-	isn't actually true, i think.
-	
-	* C/apx-authors.sgml: update slightly.
-
-	* C/apx-bugs.sgml: remove list of 1.1.x features.
-
-	* C/usage-mainwindow.sgml: minor tweaks
-
-2002-06-25  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-prefs.sgml: more improvem,ent.
-
-2002-06-24  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-prefs.sgml: overhaul. still need to improve examples.
-
-	* C/usage-mail.sgml: link to somewhere i have deleted.
-
-	* C/usage-contact.sgml: fix sharing section more
-
-2002-06-10  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-contact.sgml: some of this was shamefully inaccurate.
-
-	* C/preface.sgml: add original location.
-
-2002-06-04  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail.sgml: Added a tip mentioning that gpg can
-	automagically contact the server for keys without having to use a
-	console.
-
-2002-05-30  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail.sgml: Reworded the signature introduction
-	paragraph.  Started work on documenting the new signature editor.
-	I am kind of unsure of the full functionality, so I'm going to
-	wait a little bit on it.
-
-2002-05-30  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: links to conf.
-
-	* C/usage-mainwindow.sgml: updated for links to configuration.
-
-	* C/preface.sgml: added "What's new?" section with a few entries.
-
-	* C/evolution.sgml: Minor stylistic tweaks, updated version
-	numbers.
-
-	* C/Makefile.am: Removed evolution-faq.sgml and usage-notes.sgml,
-	and cvs removed them. These files are vestiges of the distant
-	past.
-
-2002-05-06  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml: minor feature change in Evolution w/r/t Exchange calendars.
-
-	* C/usage-exchange.sgml: minor feature change in Evolution w/r/t Exchange calendars.
-
-	* C/usage-calendar.sgml: minor feature change in Evolution w/r/t Exchange calendars.
-
-	* C/usage-mainwindow.sgml: validation issue.
-
-2002-04-22  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: use gpg --import, as per bug 23113
-
-2002-04-01  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml: remove png-variant DTD from comments.
-	change should affect nothing.
-
-2002-04-04  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/Makefile.am: Remove bogus EXTRA_DIST with sgmldocs.make.
-	Problem pointed out by Richard Boulton <richard@tartarus.org>.
-
-2002-03-27  JP Rosevear  <jpr@ximian.com>
-
-	* C/Makefile.am: end the line properly
-
-2002-03-27  Aaron Weber  <aaron@ximian.com>
-
-	* C/topic.dat: add from branch.
-	* C/figures/*: merge from branch
-	* C/usage-calendar.sgml: merge from branch
-	* C/usage-mail.sgml: merge from branch
-	* C/usage-mail-org.sgml: merge from branch
-	* C/Makefile.am: changes from other branch
-	* C/usage-print.sgml: merge from branch
-	* C/usage-exchange.sgml: merge from branch
-	* C/usage-mail.sgml: merge from evolution-1-0-branch branch.
-
-2002-03-25  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail.sgml: Added mention that 2048 maybe recommended by
-	some people.  Fixed a typo.
-
-2002-03-23  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-print.sgml: I fixed a typo which caused the
-	documentation to not build.
-
-2002-03-14  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail-org.sgml: Did some basic cleanup.
-
-	* C/usage-mail.sgml: Linked "expunge" to the glossary.
-	Made some basic grammar changes.
-	Reindented a whole lot of things.
-
-	* C/apx-gloss.sgml: Added Postscript as a glossary definition.
-
-	* C/usage-print.sgml: Changed the introduction of this.  Do users
-	really care about gnome-print?  Linked the Postscript line to the
-	glossary.
-
-	* C/usage-mail.sgml: Pulled warning about the HTML mail stuff.
-
-2002-03-12  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail.sgml: Replaced "png" with "PNG".  This shouldn't
-	break the SGML build and it's a slow start to the XML porting
-	process.  Included information about how to create an HTML
-	signature.
-
-2002-03-11  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail.sgml: Redid wording on a title, minute change.
-	Fix indenting.
-
-2002-02-10  Kevin Breit  <mrproper@ximian.com>
-
-	* C/evolution-C.omf: Removed "The" from title.
-
-2002-02-06  Aaron Weber  <aaron@ximian.com>
-
-	* C/Makefile.am: added
-	C/figures/schedule.png,exchange-identity.png exchange-receive.png,
-	exchange-receive-options.png
-
-	* C/usage-exchange.sgml: expanded note about active directory
-	server.  added screenshot for Free/Busy feature. Doubled the size
-	of the config instructions.
-
-	* C/figures/schedule.png: New file, screenshot for free/busy feature.
-
-	* C/evolution.sgml: added correct copyright years.
-
-	* C/usage-mail-org.sgml: warning about INBOX subfolder brokenness.
-
-2002-01-29  Kevin Breit  <mrproper@ximian.com>
-
-	* C/config-prefs.sgml: Started writing an LDAP config example
-
-2002-01-27  Kevin Breit  <mrproper@ximian.com>
-
-	* C/config-prefs.sgml: Added information regarding types of search scopes
-
-	* C/usage-contact.sgml: Fixed some linking brokenness
-
-	* C/apx-gloss.sgml: Added Search Base as an entry
-	Added Search Scope as an entry
-
-	* C/config-prefs.sgml: Fixed indenting, I guess.
-
-	* C/usage-contact.sgml: Rewrote LDAP introduction paragraph
-	Added information about setting up Evolution to use LDAP.  It's just a lazy xref.
-
-2002-01-27  Ettore Perazzoli  <ettore@ximian.com>
-
-	* sgmldocs.make: Use `-f' instead of `-e' so installation of
-	topic.dat works on non-GNU systems too.
-
-2002-01-17  Aaron Weber  <aaron@ximian.com>
-
-	* C/apx-gloss.sgml: typos.
-
-2002-01-15  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-prefs.sgml: Redo the whole options/account-creation
-	thing.
-
-	* C/usage-mainwindow.sgml: Redo the whole options/account-creation
-	thing.
-
-2002-01-07  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution.sgml: Touched this file but don't think I changed
-	it.
-
-	* C/usage-calendar.sgml: mention the full-advantage section and
-	the exchange features. Expand mention of "autopick" and general
-	polish on the appointment-scheduling and peer-to-peer groupware
-	functions. Also clarify palm-sync location information. All
-	features danw mentioned as critical are now docuemnted.
- 
-	* C/usage-exchange.sgml: Fix and expand as per Danw's notes about
-	Features that need to be documented.
-
-2002-01-04  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exchange.sgml: Revised list of supported/unsupported
-	features. Changed installation instructions.
-
-2001-12-21  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exchange.sgml: add notes about server/license
-	requirements, revise "your previous options" text to flow more
-	smoothly.
-
-2002-01-04  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail.sgml: Added a tip about reply-to specification stuff
-
-	* C/usage-calendar.sgml: Fixed brokenness
-
-2001-12-27  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-exchange.sgml: Small fix
-
-2001-12-24  Kevin Breit  <mrproper@ximian.com>
-
-	* C/apx-bugs.sgml: Updated indenting
-
-	* C/apx-authors.sgml: Updated my email address
-
-	* C/usage-print.sgml: Just, ya know, small change
-
-	* C/usage-exchange.sgml: Fixed wording, tags, and indenting
-
-2001-12-22  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mainwindow.sgml: Added information about importing mutt to Evolution.
-	Added a bit of info to the above.
-
-2001-12-20  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-exchange.sgml: Added a <sect1> that discusses features of Connector
-
-2001-12-18  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exchange.sgml: add notes about server requirements.
-
-	* C/topic.dat: Changed label of "Connecting to Exchange Servers"
-	
-2001-12-18  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mainwindow.sgml: Added information about importing KMail to Evolution.
-
-2001-12-14  Kevin Breit  <mrproper@ximian.com>
-
-	* C/apx-gloss.sgml: Slight glossary changes in wording
-
-	* C/usage-mail.sgml: Indenting changes, minor reorganization.
-
-2001-12-05  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-calendar.sgml: added "meeting-announce" note ("Simple
-	meeting announcements").
-
-	* C/config-prefs.sgml: Additional links to other portions of the
-	document.
-
-2001-11-30  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: Tiny error fix.
-
-2001-11-29  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail.sgml: Added more info about pretty emails.
-
-2001-11-28  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail.sgml: Added section about how to make your email pretty.  I'll add more each day or something.
-
-2001-11-14  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Workaround for Nautilus/Scrollkeeper bug that prevents our SGML
-	files to generate the docs properly; pointed out by Greg Leblanc.]
-
-	* C/evolution-C.omf: Point to index.html instead of
-	`evolution.sgml'.
-
-	* sgmldocs.make: Install the SGML files in evolution/sgml, and the
-	HTML files in evolution.
-
-2001-10-29  Aaron Weber  <aaron@ximian.com>
-
-	* C/apx-bugs.sgml: typos, redescribe 1.1 bugs. Re-validated.
-
-	* C/apx-authors.sgml: Added last few authors, a few more credits,
-	etc. Also changed contact info and URL for evolution.
-
-	* C/menuref.sgml: did we have only 1 item in the calendar?
-	yes. Also, s/Contact Manager/Addressbook/
-	
-	* C/usage-calendar.sgml: phrasing. UI. Spelling. Validation.
-
-	* C/Makefile.am: removed config-encryption and
-	usage-encryption. Stray files. Do not use, ship, etc. All
-	encryption info is in the mail docs.
-
-	* C/config-sync.sgml: call it the addressbook. added : for <terms>
-
-	* C/config-prefs.sgml: commented out empty section.
-
-	* C/figures/print-preview.png: ch. screenshot
-
-	* C/usage-contact.sgml: address book--> addressbook
-
-	* C/usage-mail-org.sgml: added "the note below" (duplicate of data
-	in mainwindow.sgml, but so is all the import information. The
-	import process is available in two places, we should document it
-	in two places. Also typos.  removed a commented-out section on
-	subscription management-- now in usage-mail and mainwindow.
-
-	* C/usage-mail.sgml: mdash correction.
-
-	* C/usage-mainwindow.sgml: replaced &mdash; with :
-
-	* C/apx-gloss.sgml: typo.
-
-	* C/preface.sgml: gnome-help-browser doesn't understand &mdash; 
-
-2001-10-28  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail-org.sgml: Added the iCalendar format to the list of imported types.  The .ics importing was added _last minute_.
-
-	* C/usage-calendar.sgml: Fixed stupid build bugs
-
-	* C/usage-mail.sgml: Fixed a boo-boo
-
-	* C/usage-exec-summary.sgml: Touchups, nothing here, run along
-
-2001-10-27  Kevin Breit  <mrproper@ximian.com>
-
-	* C/config-prefs.sgml: Rewrite of the calendar preferences.  I love how I'm having to rewrite this 48 hours before the freeze.  Why are we waiting this long?  It's beyond me, but oh well.  I'll continue writing and listening to The Doors.
-
-	* C/figures/calendar.png: Added labels
-
-	* C/figures/mail-inbox.png: Added labels and changed which image is used
-
-	* C/evolution.sgml: Bumped the version # to 1.0
-
-	* C/figures/summary.png: I played with the labels a bit
-
-2001-10-26  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-calendar.sgml: Lots of changes on recommendation from Damon Chaplin.  We love you Damon!
-
-	* C/usage-contact.sgml: One more FIXME...done
-
-	* C/config-prefs.sgml: Fixed a definition, one less FIXME to deal with.
-
-	* C/usage-mail-org.sgml: Moved importing information here.
-
-	* C/usage-mail.sgml: Moved importing information to -org.sgml
-
-	* C/usage-mail-org.sgml: Added a note
-
-	* C/usage-mainwindow.sgml: Added screenshot and labels of stuff for summary.
-
-2001-10-24  Kevin Breit  <mrproper@ximian.com>
-
-	* C/figures/mail-composer.png: I updated this becuase the screenshot was humerously _old_.
-
-2001-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/topic.dat: s/usage-exec-summary.html/usage-summary.html.
-
-2001-10-22  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution.sgml: validation. SIlly me.
-
-2001-10-19  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.sgml: Many changes w/r/t IMAP and importation and encryption.
-
-	* C/usage-contact.sgml: A few changes, w/r/t import.
-
-	* C/usage-mainwindow.sgml: IMAP stuff.
-
-	* C/usage-exec-summary.sgml: More changes. Update to intro sect.
-	
-2001-10-19  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml: Assorted fixes. Kevin, there's a FIXME for ya in here.
-
-	* C/preface.sgml: Added a few fixes.
-
-	* C/apx-bugs.sgml: Added a link to bugzilla, and a list of a few
-	1.1 features.
-
-2001-10-19  Kevin Breit  <mrproper@ximian.com>
-
-	* C/usage-mail.sgml: Added in import dialogue documentation
-
-2001-10-07  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* C/usage-mail-org.sgml: Add a missing </orderedlist>
-	
-	* C/apx-authors.sgml: Fix my name.
-	
-2001-10-05  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.sgml: added example to filter bulk mail.
-
-2001-10-01  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: missing directory for figure file ref.
-
-2001-09-29  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Slightly improved encryption documentation.
-
-2001-09-26  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-sync.sgml: Polish, describe names of conduits.
-
-	* C/usage-sync.sgml: Minor changes.
-
-2001-09-25  Ettore Perazzoli  <ettore@ximian.com>
-
-	[Patch for Automake 1.5 compatibility pointed out by Richard
-	Boulton <richard@tartarus.org>, as per #9258.]
-
-	* sgmldocs.make ($(docname).sgml): Indent the rule with a tab
-	instead of 8 spaces.
-
-2001-09-25  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: Added Right-click-bginfo a little.
-
-	* C/usage-mail-org.sgml: s/virtual folder/vFolder
-	also use of criterion/criteria.
-
-2001-09-24  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-calendar.sgml: Fixed some brokenness
-2001-09-24  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Documented Insert -> Link a wee bit more
-
-2001-09-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Some grammar changes suggested by my girlfriend Amanda...props to Amanda!
-
-	* C/usage-calendar.sgml: Verfied to make sure it was accurate against the calendar in functionality.  Also added info about RSVP, scheduling appointments, and the like!  Finally did this.
-
-2001-09-20  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml:  move to DocBook 4.1
-
-	* C/usage-mail-org.sgml: move to DocBook 4.1
-	
-	* C/usage-mail.sgml: move to DocBook 4.1
-
-	* C/config-sync.sgml: move to DocBook 4.1
-
-	* C/apx-gloss.sgml: move to DocBook 4.1
-
-	* C/evolution.sgml: move to DocBook 4.1
-
-2001-09-19  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-calendar.sgml: more meetings-by-mail additions. Had no
-	idea this needed so much work.
-
-	* C/usage-mail.sgml: Added info about meetings-by-mail.
-	
-	* C/menuref.sgml: added F9 instructions.
-
-	* C/config-prefs.sgml: added info on how to connect to an arbitrary port.
-
-	* C/usage-mail.sgml: Revised gnome-vfs-http-proxy info.
-
-	* C/usage-exec-summary.sgml: added gnome-vfs-http-proxy
-	info. Almost the same as the stuff in usage-mail.
-
-	* C/usage-mail-org.sgml: removed regex item.
-
-2001-09-18  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Added a tip about the always encrypt button.
-
-2001-09-17  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: threaded mailview figure and img. added.
-
-	* C/usage-sync.sgml: Note about PalmOS 4 and Password Protection.
-
-	* C/figures/* (well, almost): New img.
-
-2001-09-15  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: linked to a now-obsolete section. changed link.
-
-	* C/config-prefs.sgml: Man, this needed so much more than style
-	revision-- the whole mail section had to be redone. Yech.
-
-	* C/usage-mail.sgml: moved "sharing mail" tip from config-prefs.
-
-	* C/config-prefs.sgml: style.
-
-2001-09-13  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-calendar.sgml: Add more info on tasks features.
-
-2001-09-11  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution.sgml: Validation issues.
-
-2001-09-10  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-contact.sgml: Contact lists.
-
-	* C/usage-mail.sgml: Contact Lists.
-
-	* C/menuref.sgml: Verified and Corrected.
-
-2001-09-10  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Verified that all functionality is in here, should be!
-
-2001-09-05  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: applied patch.
-
-2001-09-04  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution.sgml: Validation.
-
-	* C/usage-print.sgml: Add .ps information.
-
-	* C/usage-mail-org.sgml: Virtual Folder/vFolder, Ximian Evolution/Evolution.
-
-2001-09-04  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml: Validate.
-	
-	* C/usage-mail.sgml: More html stuff.
-
-	* C/apx-authors.sgml: Credit kmarass.
-
-	* C/usage-contact.sgml: groups-of-contacts-management.
-
-	* C/usage-mainwindow.sgml: Add more info, "whatis" section,
-	"Ximian Evolution" and "vFolder."
-
-	* C/evolution.sgml: "Ximian Evolution" not "Evolution"
-
-	* C/preface.sgml: Moved "whatis" section to usage-mainwindow, as
-	per new-outline.
-
-	* C/usage-mail.sgml: Expand deletion info. Also composer work.
-
-2001-08-30  Aaron Weber  <aaron@ximian.com>
-
-	* C/apx-gloss.sgml: remove Spam, emoticon, haiku. Revise "Virus"
-
-2001-09-04  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-print.sgml: Added infoa about Windows not handling .ps
-
-2001-09-03  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Fixed brokenness
-
-	* C/usage-mainwindow.sgml: Added info on Exchange interaction
-
-2001-08-30  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exec-summary.sgml: revise for style. added info about calendar customizing.
-
-2001-08-29  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml: Added info about NS importing.
-
-2001-08-29  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-exec-summary.sgml: Rewrote this file to be...more up to date.
-
-2001-08-28  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Renamed a xref to make it work.
-
-	* C/config-prefs.sgml: Updated for new LDAP UI.
-
-2001-08-24  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Added info about tables, rules, and images
-
-	* C/usage-calendar.sgml: Rename a few titles
-
-2001-08-22  Aaron Weber  <aaron@ximian.com>
-
-	* C/apx-gloss.sgml: public key.
-
-2001-08-22  Peter Williams  <peterw@ximian.com>
-
-	* sgmldocs.make: Oops, we need to take the basename too.
-
-2001-08-22  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: Removed NNTP docs. Improved IMAP docs. IMAP
-	still needs more work though.
-
-	* C/config-prefs.sgml: Removed NNTP docs.
-
-	* C/usage-mainwindow.sgml: s/todo/task list/, fix grammar/style.
-
-2001-08-22  Peter Williams  <peterw@ximian.com>
-
-	* sgmldocs.make (omf_timestamp): Put in a $(srcdir) here for when
-	srcdir != builddir.
-
-2001-08-21  Ettore Perazzoli  <ettore@ximian.com>
-
-	* Makefile.am: Add `sgmldocs.make' to `EXTRA_DIST'.
-
-2001-08-20  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exec-summary.sgml: Moved introductory/basic content to the
-	usage-mainwindow.sgml file. Rewrote intro.
-
-	* C/usage-contact.sgml: Moved introductory/basic content to the
-	usage-mainwindow.sgml file.Rewrote intro.
-
-	* C/usage-calendar.sgml: Moved introductory/basic content to the
-	usage-mainwindow.sgml file.Rewrote intro.
-
-	* C/usage-mail.sgml: Moved introductory/basic content to the
-	usage-mainwindow.sgml file.Rewrote intro.
-
-	* C/usage-mainwindow.sgml: Put summary-type info into
-	this file from other chapters.
-	
-	* C/topic.dat: New file. Help Menu info.
-
-2001-08-20  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-calendar.sgml: Did more event -> appointment conversions.
-
-2001-08-18  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-calendar.sgml: Renamed events to appointments (please
-	review for me as it was a simple regex replace).
-
-	* C/usage-mail.sgml: Removed "emoticon" and "root of all evil",
-	removed gargantuan, removed instances of "the the", changes
-	Virtual Folders to vFolders, renamed "Attachements and HTML Mail"
-	section, reworded "Embellish" to say "Enhance"
-
-2001-08-17  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-exec-summary.sgml: s/My Evolution/Summary/
-
-	* C/preface.sgml: Moved "Quickref" stuff to Menuref file.
-
-	* C/usage-mainwindow.sgml: removed reference to faq.
-
-	* C/menuref.sgml: Gutted. Filled with "quickref" stuff.
-
-	* C/evolution.sgml: Removed FAQ. Re-added menuref. Menuref is now
-	the "quick reference" section.
-
-2001-08-17  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Wrote documentation about HTML templates.
-
-2001-08-16  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: minor edits. Added <tip> about bug 7428.
-
-2001-08-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* C/evolution-C.omf: Place it under <category="GNOME|Applications"/>
-
-2001-08-16  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* C/Makefile.am: Small fix to build.
-	* C/evolution-C.omf: Small fix. Remove an extra space.
-	* no/Makefile.am: Same here.
-	* no/evolution-no.omf: And here.
-	
-2001-08-15  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Updated one line about bullet points.
-
-2001-08-15  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* no/*: Added beginnings of a Norwegian translation.
-	* sgmldocs.make: Forgot to add this. Kinda important.
-	* C/*.sgml: s/fig/figures/
-	* C/Makefile.am: Make it use the sgmldocs.make framework.
-	
-2001-08-14  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml: Commented out menuref.
-	* C/usage-contact.sgml: Commented out menuref.
-	* C/evolution.sgml: commented out menuref.
-	* C/preface.sgml: commented out menuref.
-
-2001-08-12  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* C/apx-authors.sgml: Added missing ;'s after entities.
-	* C/evolution-C.omf: s/en/C in Language.
-	* C/usage-mail-org.sgml: Add missing ;.
-	* C/usage-mainwindow.sgml: Same here.
-	
-2001-08-10  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail.sgml: Switched all images in entire document to
-	*not* use file extensions, so that they work properly with
-	db2ps. This doesn't completely fix the db2ps issues, but it's
-	apparently the right way to do this.
-
-2001-08-09  Aaron Weber  <aaron@ximian.com>
-
-	* C/config-prefs.sgml: Made sharing tip an orderedlist.
-
-2001-08-08  Kevin Breit  <battery841@mediaone.net>
-
-	* C/config-prefs.sgml: Add information about sharing mailbox files.
-
-2001-08-03  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-calendar.sgml: Add information about gathering actions.
-
-2001-08-02  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Added a <tip> for scrolling through mails.
-
-2001-07-30  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Fixed some breakage Aaron caused.
-
-2001-07-26  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.sgml: revised.
-
-	* C/usage-mail.sgml: revisions and stuff.
-
-2001-07-24  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution-faq.sgml: Reworded a few questions.
-
-2001-07-23  Kevin Breit <battery841@mediaone.net>
-
-	* C/Makefile.am: Pulled instance of config-setupassist.sgml to make stuff build right.
-
-2001-07-23  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml: validated.
-
-	* C/config-setupassist.sgml: Removed.
-
-	* C/evolution.sgml: removed config-setupassist.
-
-	* C/usage-exec-summary.sgml: Minor revisions.
-
-	* C/usage-contact.sgml:  Added 'format="png"' to all <image> tags
-	missing the attribute.
-
-	* C/usage-calendar.sgml: Added 'format="png"' to all <image> tags
-	missing the attribute.
-
-	* C/usage-mail.sgml: Added 'format="png"' to all <image> tags
-	missing the attribute.
-
-	* C/usage-mainwindow.sgml: Style. Merged info from preface. Added
-	'format="png"' to all <image> tags missing the attribute.
-
-	* C/preface.sgml: Style changes. Removed info that was duplicated
-	in mainwindow.sgml.
-
-2001-07-20  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mainwindow.sgml: Fixed the first time druid stuff a little more.
-	
-2001-07-16  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution-faq.sgml: Sepllcheck.
-
-2001-07-15  Kevin Breit  <battery841@mediaone.net>
-
-	* C/config-sync.sgml: Updated slightly for new design.
-
-2001-07-13  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mainwindow.sgml: Added lots of good stuff with the first time druid.
-
-2001-07-12  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution-faq.sgml: TYPO fixing.
-
-2001-07-12  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution-faq.sgml: Added "get bt for component-only crash" qandaentry.
-
-2001-07-10  Peter Williams  <peterw@ximian.com>
-
-	* */Makefile.am (dist-hook): Clean up make dist.
-
-2001-07-11  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution.sgml: validation on usage-mainwindow and usage-contact.	
-
-2001-07-11  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-calendar.sgml: More edits.
-
-	* C/usage-contact.sgml: Sick amounts of changes too!
-
-	* C/usage-mail-org.sgml: Heavy editing...touched almost everything.
-
-	* C/usage-exec-summary.sgml: Minor change.  There was only one change for this chapter, cuz I'm such a 'godly' writer...yeah.
-
-	* C/usage-mainwindow.sgml: A bit of editing.
-
-	* C/preface.sgml: Screwed with the examples and did some cleanup.
-
-2001-07-10  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mail-org.sgml: validation.
-
-2001-07-10  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Added <application> tags
-
-	* C/usage-mail-org.sgml: Added <application> tags
-
-	* C/config-prefs.sgml: Added <application> tags
-
-2001-07-09  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-exec-summary.sgml: Editing
-
-	* C/usage-mail.sgml: Editing
-
-	* C/usage-mail-org.sgml: Editing
-
-	* C/usage-calendar.sgml: Editing
-
-	* C/usage-contact.sgml: Editing
-
-	* C/usage-mail-org.sgml: Mention UNMATCHED
-
-	* C/usage-mail.sgml: Commented on trash being a vFolder
-
-2001-07-06  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Spell check
-
-	* C/usage-calendar.sgml: Spell check
-
-2001-07-05  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mainwindow.sgml: Added orderedlists.
-
-	* C/usage-exec-summary.sgml: Added orderedlists.
-
-	* C/usage-contact.sgml: Added orderedlists.
-
-	* C/usage-mail-org.sgml: Added orderedlists.
-
-2001-07-03  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Put in lots of orderedlists...more SGML, less
-	for the user to read.  They'll thank me in droves later.
-
-	* C/usage-exec-summary.sgml: Fixed build error
-
-2001-06-29  Jeffrey Stedfast  <fejj@ximian.com>
-
-	* white-papers/mail/camel.sgml: Updated slightly.
-
-	* Camel-Classes: Updated.
-
-2001-07-02  Kevin Breit  <battery841@mediaone.net>
-
-	* C/apx-common-tasks.sgml: Created its own file.
-
-	* C/usage-mainwindow.sgml: You name it.
-
-	* C/preface.sgml: Pulled shortcuts from here into its own apx
-
-	* C/evolution.sgml: Reordered entities
-	
-2001-06-30  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Pulled organizing stuff, made its own file.
-
-2001-06-26  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution-faq.sgml: Revised move/rename/copy questions, now
-	that these functions work.
-
-2001-06-25  Aaron Weber  <aaron@ximian.com>
-
-	* C/evolution-faq.sgml: Now that bug-buddy works with our
-	bugzilla, update faq to reflect it.
-
-2001-06-25  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Put config-encryption in usage-mail.sgml.
-	config-encryption.sgml should be depreciated.
-
-	* C/usage-contact.sgml: Fixed typo
-
-	* C/usage-mail.sgml: Added info about mailing lists Elaborated on
-	mailing lists
-
-	* C/usage-exec-summary.sgml: Fixed a few typos
-
-	* C/preface.sgml: Added section for importing files
-
-	* C/usage-calendar.sgml: Removed some *'s that are causing
-	problems.
-
-2001-06-22  Kevin Breit  <battery841@mediaone.net>
-
-	* C/preface.sgml: Put in Contacts information in the quicktasks.
-
-	* C/usage-mail.sgml: Pulled some redundant information.
-
-2001-06-21  battery841  <battery841@mediaone.net>
-	
-	* C/preface.sgml, C/fig/mail-inbox.png, C/fig/mainwindow-pic.png,
-	C/usage-mail.sgml: Updated screenshots and redid layout for
-	graphics on pages.
-	
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-	
-	* C/usage-contact.sgml: Fixed .gif problem
-		
-	* C/usage-mail.sgml:
-	
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Specify the file format
-
-	* C/usage-contact.sgml, C/usage-mail.sgml:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-		
-	* C/usage-mail.sgml: Trying to fix the .gif problem
-
-	* C/fig/calendar.png, C/fig/contact.png, C/usage-calendar.sgml:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-calendar.sgml: Redid graphics to add labels to them and
-		described the labels in text.
-
-	* C/config-encryption.sgml, C/evolution.sgml:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/evolution.sgml: Added config-encryption.sgml for building
-
-	* C/fig/calendar.png, C/fig/config-cal.png, C/fig/config-mail.png,
-	C/fig/filter-assist-fig.png, C/fig/filter-new-fig.png,
-	C/fig/mail-composer.png, C/fig/mail-druid-pic.png,
-	C/fig/mail-inbox.png, C/fig/print-dest.png,
-	C/fig/print-preview.png, C/fig/vfolder-createrule-fig.png:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/fig/*png: Updated graphics for newer UI.
-
-	* C/fig/full-1.png, C/fig/full-2.png, C/fig/full-3.png,
-	C/fig/full-4.png, C/fig/full-5.png, C/fig/full-6.png,
-	C/fig/full-7.png, C/fig/mainwindow-pic.png, C/usage-mail.sgml:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Redid graphics to add labels to them and
-	described in labels in text.  Looks good!
-
-	* C/usage-encryption.sgml:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/encryption.sgml: Added file
-
-	* C/preface.sgml:
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* doc/ChangeLog: Moved my entires to doc/ChangeLog per request of
-	danw
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-contact.sgml: Fixed .gif problem
-
-	* C/usage-mail.sgml: Specify the file format
-	
-	* C/usage-mail.sgml: Trying to fix the .gif problem
-	
-	* C/usage-calendar.sgml: Redid graphics to add labels to them and
-	described the labels in text.
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/evolution.sgml: Added config-encryption.sgml for building
-
-	* C/fig/*png: Updated graphics for newer UI.
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Redid graphics to add labels to them and
-	described in labels in text.  Looks good!
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml:
-
-2001-06-21  Kevin Breit  <battery841@mediaone.net>
-
-	* C/encryption.sgml: Added file
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* ChangeLog: Moved my entires to doc/ChangeLog per request of danw
-	
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* C/config-setupassist.sgml: Updated for new UI.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-sync: Reworded a little bit for more descrip.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-calendar.sgml: Documented categorizing an event.
-
-2001-06-20  Kevin Breit  <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Updated Bcc: example
-
-2001-06-19  Aaron Weber  <aaron@ximian.com>
-
-	* C/usage-mainwindow.sgml: A couple changes to Kevin's update.
-
-2001-06-19  Kevin Breit <battery841@mediaone.net>
-
-	* C/usage-mail.sgml: Basic edits
-	
-2001-06-19  Kevin Breit <battery841@mediaone.net>
-
-	* C/usage-exec-summary: Updated to say "My Evolution"
-
-2001-06-19  Kevin Breit <battery841@mediaone.net>
-
-	* C/apx-gloss.sgml: Added definition.
-
-	* C/usage-mainwindow.sgml: Routine updates.
-	
-2001-06-07  Duncan Mak  <duncan@lumox.simplemente.net>
-
-	* C/evolution-faq.sgml: Fixed a typo. Thanks to Greg Leblanc for
-	pointing this out.
-
-2001-05-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/evolution-faq.sgml: Re-indented.
-
-2001-05-18  Duncan Mak  <duncan@ximian.com>
-
-	* C/evolution-faq.sgml: Added two questions about importing
-	Outlook (text from Iain).  Fixed some tags and cleaned up a bit
-	here and there.
-
-2001-05-18  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/evolution-faq.sgml: Added a question about the permission
-	issues with /var/spool/mail.
-
-2001-05-15  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/Makefile.am (SGML_FILES): Renamed to `GUIDE_SGML_FILES'.
-	(EXTRA_DIST): Add `$(FAQ_SGML_FILES)'.
-	(all): Depend on `evolution-faq' too.
-	(evolution-faq): New.
-	(install-data-local): Depend on `evolution-faq' too.  Install the
-	FAQ into `$(evolution_helpdir)/evolution-faq' and the guide into
-	`$(evolution_helpdir)/evolution-guide'.
-
-	* C/evolution-faq.sgml: New.
-
-2001-04-23  Jon Trowbridge  <trow@ximian.com>
-
-	* C/Makefile.am (install-data-local): Changed dependency for
-	install-data-local from "evolution" to "evolution-guide".
-
-2001-04-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/Makefile.am (evolution-guide): Use `$(srcdir)' here.
-
-2001-04-23  Ettore Perazzoli  <ettore@ximian.com>
-
-	* C/Makefile.am (SGML_FILES): Add `evolution.sgml'.
-	(evolution-guide): Process `evolution.sgml', not
-	`evolution-guide.sgml'.
-	(dist-hook): s/evolution-guide/evolution/
-	(install-data-local): Likewise.
-
-2001-02-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-authors.sgml: s/helixcode/ximian (How I missed this page
-	on the first go-round I don't know).
-
-2001-03-14  Gediminas Paulauskas <menesis@delfi.lt>
-
-	* C/Makefile.am: there's no apx-fdl.sgml and evolution-guide.sgml
-	anymore
-
-2001-02-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: IMAP subscriptions stuff.
-
-2001-02-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Advanced search/show all/save search stuff.
-
-	* C/evolution.sgml: This file replaces evolution-guide.sgml, for
-	Nautilus Readiness.
-
-	* C/apx-gloss.sgml: glossterm conduit.
-
-	* C/config-sync.sgml: Glossterm conduit.
-
-	* C/preface.sgml: Checked over for Keyboard-Shortcut and other
-	truthfulness.
-
-2001-02-15  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Validated. Verified. Markup fixed in
-	several individual files.
-
-	* C/apx-gpl.sgml: cvs-removed for GNOME 1.4 compliance.
-
-	* C/apx-fdl.sgml: cvs-removed for GNOME 1.4 compliance.
-
-2001-02-09  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-sync.sgml: Overhaul. Now accurate and truthful and
-	clear.
-
-	* C/usage-calendar.sgml: Minor Changes.
-
-2001-02-08  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Minor Changes.
-
-	* C/usage-mail.sgml: Minor Changes.
-
-2001-02-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml: Added section, but left blank til UI stabilizes.
-
-	* C/usage-exec-summary.sgml: A little functionality described.
-
-	* C/usage-mainwindow.sgml: Added tasks and Exec-summary.
-
-	* C/usage-calendar.sgml: Describe semi-autonomy of task pad.
-
-2001-02-06 Aaron Weber <aaron@ximian.com>
-
-	* C/usage-contact.sgml: s/contact manager/address book/ and
-	revised text.
-
-	* C/usage-exec-summary.sgml: New file. Describes Executive
-	Summary.
-	
-2001-01-19  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: More of Megan's revisions, and Field Chooser
-	functions in the Sort section.
-
-	* C/apx-gloss.sgml: added "ToolTip"
-
-2001-01-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: s/Helix Code/Ximian, and Megan's comments.
-
-	* C/usage-mainwindow.sgml: s/Helix Code/Ximian/, and Megan's
-	comments.
-
-	* C/evolution-guide.sgml: s/Helix Code/Ximian/
-
-2000-12-13  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Revisions as suggested by Dan.  Especially to
-	filter dialogs... which still need some renaming, IMHO.
-
-	* C/usage-mainwindow.sgml: Revisions as suggested by
-	Dan. Especially to the Folder Limits thing, which still upsets me
-	somehow.
-
-	* C/preface.sgml: Revisions as suggested by Dan.
-
-2000-11-29  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-setupassist.sgml: added some <glossterms>, added
-	linkends to existing glossterms.
-
-2000-11-28  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Changed intro to Config section. Now
-	defines what, exactly, "configurable" means.
-
-	* C/usage-print.sgml: Stylistic revisions.
-
-	* C/usage-calendar.sgml: Stylistic revisions.
-
-	* C/usage-contact.sgml: Stylistic revisions.
-
-2000-11-09  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml: Message heading Right-Click Menu.
-
-2000-11-03  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gloss.sgml: The regexp example was quite wrong. Props to
-	Sasha.
-
-2000-11-02  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Style and spelling.
-
-2000-11-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Fixed validation errors.
-
-	* C/apx-gloss.sgml: Fixed HTML, style stuff.
-
-	* C/usage-mail.sgml: Stylistic overhaul.
-
-	* C/usage-mainwindow.sgml: Fixed groups in shortcut bar, fixed
-	folder navigation tips.
-
-2000-10-31  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Minor stylistic revisions.
-
-2000-10-30  Aaron Weber  <aaron@helixcode.com>
-
-	* COPYING-DOCS: New file. This is the official place to put the
-	FDL now.
-	
-
-2000-11-01  Radek Doulik  <rodo@helixcode.com>
-
-	* Keybindings: added composer keybindings description
-
-2000-10-25  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml: Actions -> New Directory Server added.
-
-	* C/config-prefs.sgml: Actions -> New Directory Server added.
-
-	* C/usage-contact.sgml: Actions -> New Directory Server added.
-
-	* C/menuref.sgml: Added mail Settings->Manage Subscriptions menu.
-
-	* C/usage-mail.sgml: Subscriptions section added. Quite
-	incomplete, though.
-
-2000-10-11  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Re-checked validity of all files. Made
-	minor changes to menuref.sgml, usage-mail.sgml, usage-print.sgml
-	to bring up to spec.
-
-	* C/usage-mail.sgml: Redid Filter & Vfolder to match the new &
-	improved functionality.
-
-	* C/fig/*: Re-did remaining screenshots.
-
-2000-10-10  Aaron Weber  <aaron@helixcode.com>
-	
-	* C/usage-print.sgml: New file, describing printing and
-	print-preview.
-
-	* C/fig/print-preview.png: New file.
-
-	* C/fig/print-dest.png: New file.
-
-	* C/evolution-guide.sgml: Added usage-print entity.
-
-	* C/menuref.sgml: Fixed calendar menu stuff.
-
-	* C/usage-mail.sgml: No more "Actions" menu, other assorted
-	menu-related changes.
-
-2000-10-06  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/ * replaced a whole bunch of screenshots.
-
-2000-10-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Described Search features.
-
-	* C/menuref.sgml: Contact Manager menus fixed.
-
-2000-10-04  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Fixed glossterms.
-
-	* C/usage-mail.sgml: Fixed glossterms, filenames, spellchecked.
-
-	* C/apx-gloss.sgml: Added "Inline," "VCard".
-
-	* C/usage-mainwindow.sgml: Fixed glossterms,
-	filenames. Spellchecked.
-
-	* C/usage-mail.sgml: Fixed glossterms, filenames. Spellchecked.
-
-	* C/evolution-guide.sgml: New Legalnotice. Removed FDL and GPL,
-	  which are now included as part of the gnome-help package.
-
-	* C/usage-contact.sgml: Spellcheck. Fixed some wording, and
-	responded to clahey's suggestions-- notably, commented out the
-	"add to master list" category feature.
-
-	* C/usage-calendar.sgml: Spellcheck. Fixed wording, event overlap
-	description.
-	
-	* C/evolution-guide.sgml: Spellcheck. Commented out Notes
-	entities.
-
-	* C/usage-notes.sgml: Spellchecked, then decided to comment out
-	this file/chapter and all references to it, since it's unlikely to
-	be implemented any time soon.
-
-	* C/config-setupassist.sgml: Spellcheck. Other minor updates. May
-	  need more work in the near future.
-
-	* C/usage-sync.sgml: Now it's really short. And spelled correctly.
-
-2000-10-03  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Mostly spelling. Still needs major
-	alteration.
-
-	* C/menuref.sgml: s/Appintment/Appointment, fixed small errors,
-	ran spellcheck. Still needs lots of work, since many menus have
-	changed.
-
-	* C/apx-gloss.sgml: Added Virus, Protocol, fixed vFolder,
-	spellchecked.
-
-2000-09-26  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gloss.sgml: Added sendmail and SMTP.
-
-2000-09-22  Aaron Weber  <aaron@helixcode.com>
-
-	* C/menuref.sgml: Changed to reflect new menu layout.
-
-	* C/usage-mainwindow.sgml: Changed to reflect new menu
-	layout. Again.
-
-	* C/usage-contact.sgml: Stop and Display All features.
-
-2000-09-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Switched to the "official" FSF markup.
-	  I will have to make changes to the markup-- adding ids, etc, or
-	  switch to another version of the markup. Pending discussion by
-	  GDP.
-
-	* C/apx-authors.sgml: Changed Matt Loper's email address to
-	loper.org; added Jeff Stedfast and Peter Williams to authors list,
-	realphebetized.
-
-	* C/config-prefs.sgml: Revision to reflect current options
-	labelling.
-
-	* C/evolution-guide.sgml: Changes to part intros.
-
-	* C/preface.sgml: Spelling and menu fixes.  Will need more work
-	tomorrow.
-	
-2000-09-20  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Fixed sig stuff here and in setupassist.
-
-	* C/config-sync.sgml: Fixed description of conduit usage.
-
-2000-09-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Spelling fixes, etc.
-
-2000-09-19  Federico Mena Quintero  <federico@helixcode.com>
-
-	* C/Makefile.am: Fixed to install the stylesheet-images as well.
-
-2000-09-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/ New files: contact-editor.png, mail-composer.png,
-	filter-assist-fig.png, mail-inbox.png
-
-2000-09-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Redid "soft" intro stuff.
-
-	* C/evolution-guide.sgml: Accidentally broke docs, now valid.
-
-2000-09-06  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Editing, proofing.
-
-2000-09-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Grammar, links, screenshots.
-
-	* fig/* Re-took most screenshots.
-
-	* C/usage-mail.sgml: Filters, proofing.
-
-2000-09-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Added coverage of news, clarified POP/IMAP
-	distinction (there's a theme to these four log entries here).
-
-	* C/usage-mail.sgml: Added coverage of news.
-
-	* C/config-setupassist.sgml: Revised mail sources content for
-	IMAP/POP stuff.
-
-	* C/apx-gloss.sgml: Added IMAP and POP.
-
-2000-08-31  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gloss.sgml: Added regular expressions to glossary.
-	Explanation should be removed from other portions of the book now.
-
-	* C/usage-mainwindow.sgml: Revisions, minor.
-
-	* C/apx-menuref.sgml: Now named menuref.sgml, to reflect its new
-	status as a part.
-
-	* C/evolution-guide.sgml: Structural alterations: Menuref is now a
-	part, not an appendix.
-
-	* C/apx-menuref.sgml: Added contextual menus for mail.
-
-	* C/preface.sgml: Added "quickref and pointers" sections. Props to
-	  O'Reilly for the copy of Outlook in a Nutshell which gave me the
-	  idea.
-
-2000-08-30  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mainwindow.sgml: Minor fixes.
-
-	* C/preface.sgml: Corrected grammar, added glossterms, described
-	menuref.
-
-2000-08-25  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Redid filter and vFolder assistant
-	descriptions.
-
-	* C/fig/filter-new-fig.png: Replaced with new assistant pic.
-
-	* C/fig/filter-assist-fig.png: New file, showing only assistant.
-
-	
-	* C/apx-menuref.sgml: Finished message composer and calendar
-	editor menus. Looked at Contact Editor menus and decided to
-	document those features after implementation.
-
-2000-08-24  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-menuref.sgml: Message Composer File and Edit menus.
-
-2000-08-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-menuref.sgml: Added editor sections.
-	
-	* C/evolution-guide.sgml: Included Menu Reference Appendix.
-
-2000-08-22  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Minor markup changes.
-
-	* C/apx-menuref.sgml: New File. Menu Reference. Still needs much
-	work, but not bad for an evening.
-
-2000-08-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Kevin's diff applied, with minor changes.
-
-2000-08-09  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Fixed bugs in validation. Went home to
-	sleep.
-
-	* C/usage-mainwindow.sgml: Redid menubar description.
-	
-
-	* C/config-prefs.sgml: Added coverage of folder config, requested
-	that feature be transferred to config section. Switched to
-	variablelist in "Other" config section.
-
-	* C/usage-mail.sgml: Added coverage of right-click on messages,
-	threaded-view.
-
-	* C/usage-mainwindow.sgml: Right-click on folder menu reinstated.
-
-2000-08-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: Added news server coverage.  Other config
-	proofing changes.
-	
-
-2000-08-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/apx-gpl.sgml: New file.  Contains contents of "COPYING", but
-	marked up (probably not very well, but valid) as docbook
-	(SGML).
-
-	* C/evolution-guide.sgml: Subtle change to the legal notice:
-	distinguished manual license from software license. Linked to
-	apx-gpl.sgml above.
-
-	* C/usage-calendar.sgml: I redid all the usage files.
-
-2000-07-21  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: Added password remembering/forgetting
-	feature.
-
-	* C/config-prefs.sgml: Mostly moved to variablelists, a few
-	language changes.
-
-	* C/config-setupassist.sgml: Minor changes to formatting, wording.
-
-	* C/usage-notes.sgml: Changed trademark references, other minor
-	changes.
-
-	* C/usage-calendar.sgml: Minor fixes, added additional calendar
-	section, removed references to unimplemented features. Spellcheck,
-	prep for 0.3 release.
-	
-2000-07-19  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mail.sgml: lots of minor fixes to language. added
-	desc. of clahey's cool button-address thing.
-
-	* C/usage-mainwindow.sgml: fixed itemizedlists, ch. to shortcut
-	bar & folder descs, removed refs to trash.
-
-2000-07-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Altered category addition stuff, plus
-	suggestions from Kevin.
-
-	* C/apx-gloss.sgml: Added ldap and signature definitions (from
-	Kevin).
-
-	* C/usage-mail.sgml: Move to variablelists from itemizedlists.
-
-2000-07-14  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: moved to variablelists from itemizedlists
-	* C/usage-calendar.sgml: moved to variablelists from itemizedlists
-
-2000-06-29  Aaron Weber  <aaron@helixcode.com>
-
-	* C/preface.sgml: Minor fixes.
-
-	* C/usage-notes.sgml: New File for feature that is yet to come.
-	* C/evolution-guide.sgml: Added entity for notes chapter.
-	* C/usage-mainwindow.sgml: Un-commented references to notes section.
-	
-	* C/apx-authors.sgml: Removed dcm from author list.
-
-	* C/usage-calendar.sgml: Added to-do list features.
-
-2000-06-28  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: commented out future features; redid
-	contact editor stuff.
-
-	* C/apx-gloss.sgml: Removed "live doc" and added "minicard"
-
-2000-06-27  Aaron Weber  <aaron@helixcode.com>
-
-	* C/devel-action.sgml: Removed file.
-	* C/devel-script.sgml: Same.
-	* C/devel-component.sgml: Same.
-	* C/preface.sgml: Removed references to devel section.
-	* C/evolution-guide.sgml: Removed references to devel section.
-
-2000-06-23  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: Made moderate to major stylistic updates
-	to this, apx-gloss.sgml, and to all files beginning with "usage,"
-	especially wrt HTML mail.
-	
-
-2000-06-15  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: Category stuff improved.
-
-	* C/usage-calendar.sgml: Now covers how to add an event properly.
-
-2000-07-17  Federico Mena Quintero  <federico@helixcode.com>
-
-	* Makefile.am (SUBDIRS): Added the devel directory.
-
-2000-06-28  Peter Williams  <peterw@curious-george.helixcode.com>
-
-	* C/Makefile.am (SGML_FILES): Don't depend on the newly-removed
-	devel-*.sgml files.
-
-2000-06-16  Damon Chaplin  <damon@helixcode.com>
-
-	* C/.cvsignore: added evolution-guide and evolution-guide.junk
-	so we don't get the '? doc/C/evolution-guide' messages each time we
-	do a cvs update.
-
-2000-06-14  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-mainwindow.sgml: added sect on menubar, other minor changes.
-
-	* C/usage-mail.sgml: Improved filter and vfolder
-	description, and some minor changes from me and Kevin.
-
-2000-06-07  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: finished adding calendar prefs. screenshots.
-	* C/fig/config-cal.png: new file (screenshot for above)
-	* C/fig/config-mail.png: same
-	
-2000-06-05  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-calendar.sgml: Incorporated chgs from Kevin.
-	
-	* C/config-prefs.sgml: began total overhaul of structure and added
-	content reflecting new prefs items.  needs LOTS more work.
-
-	* C/usage-mail.sgml: changed some references to id's in the 
-	config-prefs section.	
-
-	* C/fig/config-mail.png: changed filename from config-prefs.png
-
-2000-06-01  Aaron Weber  <aaron@helixcode.com>
-
-	* C/config-prefs.sgml: filename was wrong, altered.
-
-	* C/usage-mail.sgml: improved filter instructions, vFolder
-	instructions.  still need work though.
-	
-
-	* C/usage-contact.sgml: added screenshot.
-
-	* C/usage-calendar.sgml: added screenshot.
-
-	* C/config-prefs.sgml: added screenshots, and now describes the
-	actual prefs dialogs.
-
-	* C/fig/config-camel.png: new (screenshot) file
-	* C/fig/filter-druid.png: same
-	* C/fig/vfolder-druid.png: same
-	* C/fig/calendar.png: same
-	* C/fig/contact.png: same
-	* C/fig/vfolder-createrule-fig.png: same
-	* C/fig/filter-new-fig.png: same
-	* C/fig/config-camel.png: same
-
-2000-06-01  Dan Winship  <danw@helixcode.com>
-
-	* Makefile.am: recurse into the C directory
-
-	* C/Makefile.am: Rules to build and install the docs. Mostly
-	stolen from gnomecal. Only works if you have GDP stuff
-	(http://www.gnome.org/gdp/) set up on your machine, but won't make
-	the build fail if you don't.
-
-2000-05-29  Aaron Weber  <aaron@helixcode.com>
-
-	* C/usage-contact.sgml: incorporated kevins notes.
-	* C/usage-mainwindow.sgml: incorporated kevins notes.
-
-2000-05-27  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evolution-guide.sgml: added Kevin Breit to author and
-	copyright.
-
-	* C/apx-authors.sgml: Put app authors in a simplelist.
-
-	* C/usage-mail.sgml: Removed USAGE-SETUP insertion, added xref to send
-        users to config-setupassist chapter. This and the following changes 
-	take setup druid coverage out of usage 
-	section and put it in config section. 
-	* C/config-setupassist.sgml: Added mail druid coverage from
-	usage-setup.sgml.
-	* C/usage-setup.sgml: Removed file. contents in
-	config-setupassist.sgml.  
-	* C/evolution-guide.sgml: Removed
-	USAGE-SETUP entity (and file usage-setup.sgml.)
-
-	
-2000-05-26  Aaron Weber  <aaron@helixcode.com>
-
-	* C/fig/mainwindow-pic.png: new file
-	* C/fig/mail-druid-pic.png: new file
-	* C/fig: New directory, for figure graphics.
-
-	* C/apx-gloss.sgml: new file. glossary. thx. to kevin from chicago.
-	
-	* C/usage-setup.sgml: More accurate description of druid, and
-	moved to mail section-- see usage-mail.sgml entry.  This is a new
-	location for this entity, and it may move more later.
-	
-
-	* C/usage-mainwindow.sgml: altered description of starting
-	evolution. added screenshot for main-window picture. 
-
-	* C/usage-mail.sgml: added screenshots, added coverage of setup
-	druid and put it into get-and-send section, which is probably not
-	where it should stay.  Also started filter druid coverage and
-	clarified examples, esp. in Bcc: section.
-
-	* C/usage-contact.sgml: Clarified examples.
-
-	* C/preface.sgml: rewording of "what is" and "about book" sections.
-
-	* C/evolution-guide.sgml: added glossary entity APX-GLOSS, altered
-	phrasing in part intros, changed order of Setup-assistant section.
-
-	* C/config-prefs.sgml: changed wording, removed ref. to re-running
-	setup assistant.
-
-2000-05-18  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evo_book_0.1.sgml: removed.	
-
-	* C/apx-authors.sgml: new file.
-	* C/apx-bugs.sgml: same.
-	* C/apx-fdl.sgml: same.
-	* C/config-prefs.sgml: same.
-	* C/config-setupassist.sgml: same.
-	* C/config-sync.sgml: same.
-	* C/devel-action.sgml: same.
-	* C/devel-component.sgml: same.
-	* C/devel-script.sgml: same.
-	* C/evolution-guide.sgml: same.
-	* C/preface.sgml: same.
-	* C/usage-calendar.sgml: same.
-	* C/usage-contact.sgml: same.
-	* C/usage-mail.sgml: same.
-	* C/usage-mainwindow.sgml: same.
-	* C/usage-setup.sgml: same.
-	* C/usage-sync.sgml: same.
-
-2000-05-07  Dan Winship  <danw@helixcode.com>
-
-	* Camel-Classes: sync
-
-2000-04-16  Aaron Weber  <aaron@helixcode.com>
-
-	* C/evo_book_0.1.sgml: new file (doc sgml)
-	
-	* C/ : New directory for doc sgml & graphics
-
-2000-03-05  Christopher James Lahey  <clahey@helixcode.com>
-
-	* white-papers/widgets/e-table.sgml: Added Miguel to the author
-	list for ETable.
-
-2000-03-03  Christopher James Lahey  <clahey@helixcode.com>
-
-	* white-papers/widgets/, white-papers/widgets/e-table.sgml: New
-	doc for the ETable widget.
-
-	* ChangeLog: Created a ChangeLog file for the docs file and
-	integrated the individual ChangeLogs.
-
-2000-03-01  Dan Winship  <danw@helixcode.com>
-
-	* ibex.sgml: Ibex white paper
-
-2000-02-29  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: Sections for the calendar user agent and the
-	calendar client library.
-
-2000-02-29  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: Reorg a bit more, make the <PRE> section narrower,
-	add more references to graphics (the graphics themselves are
-	still in beta), add a section on CamelStream.
-
-2000-02-28  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: Section for the personal calendar server.
-
-2000-02-28  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: add Bertrand to authors, edit his additions
-
-2000-02-28  bertrand  <bertrand@helixcode.com>
-
-	* camel.sgml: add a blurb about camel offering
-	uniform interface. needs style and grammar corrections. 
-	Talk about virtual folders.
-	Talk about lightweight messages
-	Talk about IMAP. 
-
-2000-02-28  Dan Winship  <danw@helixcode.com>
-
-	* camel.sgml: Beginnings of a Camel white paper
-
-2000-02-25  Federico Mena Quintero  <federico@helixcode.com>
-
-	* calendar.sgml: New file for the Evolution calendaring white paper.
diff --git a/help/Makefile.am b/help/Makefile.am
deleted file mode 100644
index 3d27ac8780..0000000000
--- a/help/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = C
-
-EXTRA_DIST = xmldocs.make omf.make
diff --git a/help/README_Translations b/help/README_Translations
deleted file mode 100644
index cc02f1aa5e..0000000000
--- a/help/README_Translations
+++ /dev/null
@@ -1,46 +0,0 @@
-The translations for evolution-guide should be placed in 
-evolution/doc/<LANG_CODE>
-
-In this directory you'll find two scripts.
-   - update_po.pl -- Usage: ./update_po.pl <LANG_CODE> 
-        Takes the sgml files from the C directory and creates sgml.po files 
-	in a directory called <LANG_CODE>.po 
-	You should translate this files as you would any other .po file, but
-	you have to make sure you place all tags and don't miss anyone.
-
-   - update_translation.pl -- Usage: ./update_translation.pl <LANG_CODE>
-        Takes the sgml files from the C directory, the sgml.po files from 
-	the <LANG_CODE>.po directory and creates the translated sgml files 
-	and places them on the <LANG_CODE> directory.
-	If a paragraph it is not translated the originial paragraph in 
-	english is used instead (fuzzy paragraph are considered as 
-	translated for the moment). Doing it this way you can make sure 
-	you didn't miss any sgml tag on the .po files by compiling the 
-	evolution guide.
-
-Of course, translations can be done as usual translating the .sgml files 
-directly. But let me point out a few advantages of doing it this way.
-
-* You can start translating the guide as soon as you want. Doesn't matter 
-  if the original files changes. No more waiting for the docu to be called
-  stable.
-
-* When a paragraph changes, it is marked as fuzzy, so you don't have to be 
-  playing with diff to find out if the original sgml file changed and where.
-
-* You don't need to keep several copies of the sgml files (usually you have
-  to keep a copy of the file you are translating and an up-to-date copy to 
-  be able to do a diff, to find out the changes)
-
-
-If you want to make any modification to my scripts, please let me know 
-before you do so and send me an explanation of the changes you want to 
-make (this is only for learning purposes, I allways like to know how to 
-make a better script) Of course, the scripts are under GPL, so you can do 
-with them allmost anything you want. 
-If you want to use this scripts in any other project different from the 
-evolution guide translation, please let me know (just to make me fell good 
-because people is using something I wrote ;-) )
-
-
-Héctor García Álvarez <hector@scouts-es.org>
diff --git a/help/devel/executive-summary/evolution-services.hierarchy b/help/devel/executive-summary/evolution-services.hierarchy
deleted file mode 100644
index 37559d819d..0000000000
--- a/help/devel/executive-summary/evolution-services.hierarchy
+++ /dev/null
@@ -1,7 +0,0 @@
-GtkObject
-  BonoboObject
-    ExecutiveSummaryComponent
-    ExecutiveSummaryComponentFactory
-    Handle to remote Bonobo::Unknown
-      ExecutiveSummaryComponentFactoryClient
-    ExecutiveSummaryHtmlView
diff --git a/help/devel/importer/evolution-shell-importer.hierarchy b/help/devel/importer/evolution-shell-importer.hierarchy
deleted file mode 100644
index c46ebdf782..0000000000
--- a/help/devel/importer/evolution-shell-importer.hierarchy
+++ /dev/null
@@ -1,7 +0,0 @@
-GtkObject
-  BonoboObject
-    BonoboXObject
-      EvolutionImporter
-      EvolutionImporterListener
-    Handle to remote Bonobo::Unknown
-      EvolutionImporterClient
diff --git a/help/es.po/apx-authors.sgml.po b/help/es.po/apx-authors.sgml.po
deleted file mode 100644
index 362ac349fa..0000000000
--- a/help/es.po/apx-authors.sgml.po
+++ /dev/null
@@ -1,178 +0,0 @@
-# Translation into Spanish of Evolution docs.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Héctor García Álvarez <hector@scouts-es.org>, 2000.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution-docs\n"
-"POT-Creation-Date: 2001-04-20 13:43+0200\n"
-"PO-Revision-Date: 2000-12-28 15:38+0100\n"
-"Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: tmp/apx-authors.sgml.h:1
-msgid ""
-"     <para>\n"
-"      <application>Evolution</application> was written by:\n"
-"<simplelist>\n"
-"     <member>Seth Alves: <email>alves@helixcode.com</email></member>\n"
-"     <member>Anders Carlsson: <email>andersca@gnu.org</email></member>\n"
-"     <member>Damon Chaplin: <email>damon@helixcode.com</email></member>\n"
-"     <member>Clifford R. Conover: <email>rusty@zootweb.com</email></member>\n"
-"     <member>Miguel De Icaza: <email>miguel@helixcode.com</email></member>\n"
-"     <member> Radek Doulik: <email>rodo@helixcode.com</email></member>\n"
-"     <member>Arturo Espinoza: <email>arturo@nucleu.unam.mx</email></member>\n"
-"     <member>Larry Ewing: <email>lewing@helixcode.com</email></member>\n"
-"     <member>Bertrand Guiheneuf: <email>bertrand@helixcode.com</email></"
-"member>\n"
-"     <member>Tuomas Kuosmanen: <email>tigert@gimp.org</email></member>\n"
-"     <member>Christopher J. Lahey: <email>clahey@helixcode.com</email></"
-"member>\n"
-"     <member>Matthew Loper: <email>matt@loper.org</email></member>\n"
-"     <member>Federico Mena: <email>federico@helixcode.com</email></member>\n"
-"     <member>Eskil Heyn Olsen: <email>deity@eski.dk</email></member>\n"
-"     <member>Nat Friedman: <email>nat@helixcode.com</email></member>\n"
-"     <member>Ettore Perazzoli: <email>ettore@helixcode.com</email></member>\n"
-"     <member>Jeffrey Stedfast: <email>jeff@helixcode.com</email></member>\n"
-"     <member>Russell Steinthal: <email>rms39@columbia.edu</email></"
-"member>     \n"
-"     <member>Peter Teichman: <email>peter@helixcode.com</email></"
-"member>     \n"
-"     <member>Chris Toshok: <email>toshok@helixcode.com</email></member>\n"
-"     <member>Peter Williams: <email>peter@newton.cx</email></member>\n"
-"     <member>Dan Winship: <email>danw@helixcode.com</email></member>\n"
-"     <member>Michael Zucchi: <email>notzed@helixcode.com</email></member>\n"
-"</simplelist>\n"
-"and other dedicated GNOME programmers. \n"
-"</para>\n"
-msgstr ""
-"     <para>\n"
-"      <application>Evolution</application> ha sido escrita por:\n"
-"<simplelist>\n"
-"     <member>Seth Alves: <email>alves@helixcode.com</email></member>\n"
-"     <member>Anders Carlsson: <email>andersca@gnu.org</email></member>\n"
-"     <member>Damon Chaplin: <email>damon@helixcode.com</email></member>\n"
-"     <member>Clifford R. Conover: <email>rusty@zootweb.com</email></member>\n"
-"     <member>Miguel De Icaza: <email>miguel@helixcode.com</email></member>\n"
-"     <member> Radek Doulik: <email>rodo@helixcode.com</email></member>\n"
-"     <member>Arturo Espinoza: <email>arturo@nucleu.unam.mx</email></member>\n"
-"     <member>Larry Ewing: <email>lewing@helixcode.com</email></member>\n"
-"     <member>Bertrand Guiheneuf: <email>bertrand@helixcode.com</email></"
-"member>\n"
-"     <member>Tuomas Kuosmanen: <email>tigert@gimp.org</email></member>\n"
-"     <member>Christopher J. Lahey: <email>clahey@helixcode.com</email></"
-"member>\n"
-"     <member>Matthew Loper: <email>matt@loper.org</email></member>\n"
-"     <member>Federico Mena: <email>federico@helixcode.com</email></member>\n"
-"     <member>Eskil Heyn Olsen: <email>deity@eski.dk</email></member>\n"
-"     <member>Nat Friedman: <email>nat@helixcode.com</email></member>\n"
-"     <member>Ettore Perazzoli: <email>ettore@helixcode.com</email></member>\n"
-"     <member>Jeffrey Stedfast: <email>jeff@helixcode.com</email></member>\n"
-"     <member>Russell Steinthal: <email>rms39@columbia.edu</email></"
-"member>     \n"
-"     <member>Peter Teichman: <email>peter@helixcode.com</email></"
-"member>     \n"
-"     <member>Chris Toshok: <email>toshok@helixcode.com</email></member>\n"
-"     <member>Peter Williams: <email>peter@newton.cx</email></member>\n"
-"     <member>Dan Winship: <email>danw@helixcode.com</email></member>\n"
-"     <member>Michael Zucchi: <email>notzed@helixcode.com</email></member>\n"
-"</simplelist>\n"
-"y otros dedicados programadores de GNOME. \n"
-"</para>\n"
-
-#: tmp/apx-authors.sgml.h:31
-msgid ""
-"    <!-- For translations: uncomment this: <para> Latin translation\n"
-"      was done by ME (<email>MYNAME@MYADDRESS</email>). Please send\n"
-"      all comments and suggestions regarding this translation to\n"
-"      SOMEWHERE.  </para> -->\n"
-msgstr ""
-"    <para> Traducción al español realizada por\n"
-"      Héctor García Álvarez (<email>hector@scouts-es.org</email>). \n"
-"      Por favor envíe todos los comentarios y sugerencias sobre esta \n"
-"      traducción a <email>hector@debian.org</email>.  </para>\n"
-
-#: tmp/apx-authors.sgml.h:36
-msgid ""
-"    <para>\n"
-"      The <application>Evolution</application> code owes a great debt\n"
-"       to the <application>GNOME-pim</application> and\n"
-"       <application>GNOME-Calendar</application> applications, and to\n"
-"       <application>KHTMLW</application>.  The developers of\n"
-"       <application>Evolution</application> acknowledge the efforts\n"
-"       and contributions of all who worked on those projects.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"      El código de <application>Evolution</application> debe mucho a las\n"
-"       aplicaciones <application>GNOME-pim</application> y\n"
-"       <application>GNOME-Calendar</application>, y a\n"
-"       <application>KHTMLW</application>.  Los desarrolladores de\n"
-"       <application>Evolution</application> reconocen los esfuerzos y\n"
-"       contribuciones de todos los que ha trabajado en dichos proyectos.\n"
-"    </para>\n"
-
-#: tmp/apx-authors.sgml.h:45
-msgid ""
-"    <para>\n"
-"      This manual was written by Aaron Weber\n"
-"      (<email>aaron@helixcode.com</email>) and Kevin Breit\n"
-"      (<email>battery841@mypad.com</email>) with the help of the\n"
-"      application programmers and the GNOME Documentation Project.\n"
-"      Please send all comments and suggestions regarding the manual to\n"
-"      the GNOME Documentation Project at\n"
-"      <email>docs@gnome.org</email>. You can also add your comments\n"
-"      online by using <ulink type=\"http\"\n"
-"      url=\"http://www.gnome.org/gdp/doctable/\">GNOME Documentation\n"
-"      Status Table</ulink>.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"      Este manual ha sido escrito por Aaron Weber\n"
-"      (<email>aaron@helixcode.com</email>) y Kevin Breit\n"
-"      (<email>battery841@mypad.com</email>) con la ayuda de los\n"
-"      programadores de la aplicación y el proyecto de documentación de\n"
-"      GNOME. Por favor envíe todos sus comentarios y sugerencias acerca de\n"
-"      este manual al proyecto de documentación de GNOME a\n"
-"      <email>docs@gnome.org</email>. También puede enviar comentarios a\n"
-"      del web usando la <ulink type=\"http\"\n"
-"      url=\"http://www.gnome.org/gdp/doctable/\">Tabla de Estado de la\n"
-"      Documentación de GNOME</ulink> (está en ingles).\n"
-"    </para>\n"
-
-#: tmp/apx-authors.sgml.h:58
-msgid "    <title>Authors</title>\n"
-msgstr "    <title>Autores</title>\n"
-
-#: tmp/apx-authors.sgml.h:60
-msgid ""
-"   <para>\n"
-"      For more information please visit the\n"
-"      <application>Evolution</application> <ulink\n"
-"      url=\"http://www.helixcode.com/apps/evolution.php3\"\n"
-"      type=\"http\">Web page</ulink>.  Please send all comments,\n"
-"      suggestions, and bug reports to the <ulink\n"
-"      url=\"http://bugs.gnome.org\" type=\"http\">GNOME bug tracking\n"
-"      database</ulink>. Instructions for submitting bug reports can be\n"
-"      found on-line at <ulink\n"
-"      url=\"http://bugs.gnome.org/Reporting.html\" type=\"http\">\n"
-"      http://bugs.gnome.org/Reporting.html</ulink>. You can also use\n"
-"      command <command>bug-buddy</command> for submitting bug reports.\n"
-"    </para>\n"
-msgstr ""
-"   <para>\n"
-"      Para más información por favor visite la \n"
-"      <ulink url=\"http://www.helixcode.com/apps/evolution.php3\"\n"
-"      type=\"http\">página web</ulink> de <application>Evolution\n"
-"      </application>. Por favor envíe todos los comentarios,\n"
-"      sugerencias, y reportes de fallo al <ulink\n"
-"      url=\"http://bugs.gnome.org\" type=\"http\">sistema de seguimiento de\n"
-"      fallos de GNOME</ulink>. Las instrucciones para hacer reportes de\n"
-"      fallos se pueden encontrar en línea en <ulink\n"
-"      url=\"http://bugs.gnome.org/Reporting.html\" type=\"http\">\n"
-"      http://bugs.gnome.org/Reporting.html</ulink>. También puede usar el\n"
-"      comando <command>bug-buddy</command> para enviar reportes de fallo.\n"
-"    </para>\n"
diff --git a/help/es.po/apx-bugs.sgml.po b/help/es.po/apx-bugs.sgml.po
deleted file mode 100644
index 58f9c2f63e..0000000000
--- a/help/es.po/apx-bugs.sgml.po
+++ /dev/null
@@ -1,56 +0,0 @@
-# Translation into Spanish of Evolution docs.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Héctor García Álvarez <hector@scouts-es.org>, 2000.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution-docs\n"
-"POT-Creation-Date: 2001-04-20 13:43+0200\n"
-"PO-Revision-Date: 2000-12-28 15:38+0100\n"
-"Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: tmp/apx-bugs.sgml.h:1
-msgid ""
-"    <para>\n"
-"      Evolution is still beta software, so the bug tracking is best\n"
-"      left to the bugzilla system and to the programmers.  However,\n"
-"      there are a number of limitations that will not be addressed\n"
-"      before version 1.0. The most notable are: Import of Microsoft\n"
-"      Outlook .pst files, and compatibility with the Microsoft\n"
-"      Exchange protocol.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"      Evolution todavía es software en fase beta, así que el seguimiento\n"
-"      de errores es mejor dejárselo al sistema bugzilla y a los \n"
-"      programadores.  Eso sí, hay cierto número de limitaciones que\n"
-"      no serán corregidas antes de la versión 1.0. Las más notables son: \n"
-"      Importación de los archivos .pst de Microsoft Outlook, y la\n"
-"      compatibilidad con el protocolo de Microsoft Exchange.\n"
-"    </para>\n"
-
-#: tmp/apx-bugs.sgml.h:10
-msgid ""
-"    <para>\n"
-"     This appendix describes known bugs and limitations of\n"
-"    <application>Evolution</application>.  Please use the GNOME\n"
-"    <application>Bug Report Tool</application> (known as\n"
-"    <command>bug-buddy</command> at the command line) if you find one\n"
-"    we have not listed.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"     Este apéndice describe errores y limitaciones conocidas de\n"
-"    <application>Evolution</application>.  Por favor use la\n"
-"    <application>Herramienta de reporte de fallos</application> de GNOME\n"
-"    (<command>bug-buddy</command> en la línea de comandos) si encuentra\n"
-"    algún error que no este en esta lista.\n"
-"    </para>\n"
-
-#: tmp/apx-bugs.sgml.h:18
-msgid "    <title>Known bugs and limitations</title>\n"
-msgstr "    <title>Errores y limitaciones conocidas</title>\n"
diff --git a/help/es.po/apx-gloss.sgml.po b/help/es.po/apx-gloss.sgml.po
deleted file mode 100644
index 2ccd5c8472..0000000000
--- a/help/es.po/apx-gloss.sgml.po
+++ /dev/null
@@ -1,745 +0,0 @@
-# Translation into Spanish of Evolution docs.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Héctor García Álvarez <hector@scouts-es.org>, 2000.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution-docs\n"
-"POT-Creation-Date: 2001-04-20 13:43+0200\n"
-"PO-Revision-Date: 2000-12-28 15:38+0100\n"
-"Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: tmp/apx-gloss.sgml.h:1
-msgid ""
-"    <para>\n"
-"      This is the most common way of transporting mail messages from\n"
-"      the client's computer (you) to the server. SMTP stands for\n"
-"      Simple Mail Transfer Protocol.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"      Esta es la manera más común de transportar mensajes desde el\n"
-"      ordenador cliente (el suyo) al servidor. SMTP significa Protocolo\n"
-"      Simple de Transferencia de Correo.\n"
-"    </para>\n"
-
-#: tmp/apx-gloss.sgml.h:7
-msgid ""
-"    <para>\n"
-"     In email terms, a signature is a piece of text placed at the end\n"
-"     of every email sent, like a hand-written signature at the bottom\n"
-"     of a written letter.  A signature can be anything from a favorite\n"
-"     quotation to a link to a web page; courtesy dictates that it be\n"
-"     fewer than four lines long.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"     En términos de un correo electrónico, una firma es un texto situado\n"
-"     al final de todos los mensajes que usted mande, como una firma hecha\n"
-"     a mano al final de una carta escrita.  Una firma puede ser cualquier\n"
-"     cosa desde su cita preferida hasta un enlace a una página web.  La\n"
-"     cortesía dicta que debe tener una longitud inferior a cuatro líneas.\n"
-"    </para>\n"
-
-#: tmp/apx-gloss.sgml.h:15
-msgid ""
-"    <para>\n"
-"     LDAP, the Lightweight Directory Access Protocol, allows a client\n"
-"     to search through a large database of addresses, phone numbers,\n"
-"     and people stored on a server.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"     LDAP, el Protocolo Ligero de Acceso a Directorio, permite a un cliente\n"
-"     buscar en una gran base de datos de direcciones, números de teléfono y\n"
-"     y personas que se encuentra en un servidor.\n"
-"    </para>\n"
-
-#: tmp/apx-gloss.sgml.h:21
-msgid "   <glossterm>LDAP</glossterm>\n"
-msgstr "   <glossterm>LDAP</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:23
-msgid "   <glossterm>SMTP</glossterm>\n"
-msgstr "   <glossterm>SMTP</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:25
-msgid "   <glossterm>Signature</glossterm>\n"
-msgstr "   <glossterm>Firma</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:27
-msgid ""
-"   <para>\n"
-"       the user can send a third party a message\n"
-"    which was sent to the user originally.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"       el usuario puede enviar un mensaje a una tercera persona    que "
-"originalmente le fue enviado a el.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:32
-msgid ""
-"   <para>\n"
-"      A format for the display of contact data.  Similar in appearance\n"
-"      to a small business card.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"      Un formato para mostrar la información de contacto.  Similar en\n"
-"      apariencia a una pequeña tarjeta de visita.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:37
-msgid ""
-"   <para>\n"
-"      A regular expression, or \"regex\", is a way of describing a\n"
-"      string of text using metacharacters or wild-card symbols.  For\n"
-"      example, the statement <userinput>fly.*so[a|u]p</userinput> means\n"
-"      \"any phrase beginning with 'fly' and ending in 'soup' or\n"
-"      'soap'\".  If you searched for that expression, you'd find both\n"
-"      \"fly in my soup\" and \"fly in my soap.\"  There's not room here to\n"
-"      go into depth, but if you want, have a look at the documentation\n"
-"      for the <command>grep</command> command.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"      Una expresión regular, o \"regex\", es una forma de describir una\n"
-"      cadena de texto usando meta caracteres o símbolos wild-card.  Por\n"
-"      ejemplo, la frase <userinput>tener.*pat[a|o]</userinput> significa\n"
-"      \"cualquier frase que comience por 'tener' y que acabe en 'pata' o\n"
-"      'pato'\".  Si usted busca esta expresión, encontrará entre otras\n"
-"      \"tener mala pata\" y \"tener un pato\".  No hay sitio aquí para\n"
-"      entrar en profundidad, pero si lo desea, puede echar un vistazo a la\n"
-"      documentación del comando <command>grep</command>.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:48
-msgid ""
-"   <para>\n"
-"      A small box of explanatory text which appears when the mouse\n"
-"      pointer is held motionless over a button or other interface\n"
-"      element.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"      Una paqueña caja con texto explicatorio que aparece cuando el puntero\n"
-"      del ratón permanece sin moverse sobre un botón o cualquier otro\n"
-"      elemento de la interfaz.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:54
-msgid ""
-"   <para>\n"
-"      As its name implies, <application>sendmail</application> is a\n"
-"      program which sends mail.  <application>Evolution</application>\n"
-"      can use it instead of <glossterm>SMTP</glossterm>; some people\n"
-"      prefer it because it offers more flexibility, but is more\n"
-"      difficult to set up.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"      Como su nombre indica, <application>sendmail</application> es un\n"
-"      programa que envía correo.  <application>Evolution</application>\n"
-"      puede usarlo en lugar de <glossterm>SMTP</glossterm>; algunas\n"
-"       personas lo prefieren porque permite más flexibilidad, pero es más\n"
-"      difícil de configurar.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:62
-msgid ""
-"   <para>\n"
-"     A portion of <application>Evolution</application> which offers\n"
-"     users fast access to the most frequently used portions of the\n"
-"     application.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"     Una parte de <application>Evolution</application> que ofrece\n"
-"     a los usuarios un rápido acceso a la partes de la aplicación\n"
-"     usadas más frecuentemente.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:68
-msgid ""
-"   <para>\n"
-"     A synchronization conduit is a small application which controls\n"
-"     the transfer of data between a handheld device and a desktop\n"
-"     computer.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"     Un enlaze de sincronización es una pequeña aplicación que controla la\n"
-"     transferencia de información entre un dispositivo de mano y un\n"
-"     ordenador.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:74
-msgid ""
-"   <para>\n"
-"     A traditional Japanese form of poetry.  The poems are three lines\n"
-"     long, with first and last lines having five syllables, and the\n"
-"     second line seven syllables.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"     Una forma de poesía tradicional japonesa.  Los poemas son de tres\n"
-"     líneas, donde la primera y la última tienen cinco sílabas, y la\n"
-"     segunda línea tiene siete sílabas.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:80
-msgid ""
-"   <para>\n"
-"     A way of describing a group of files on a computer.  With the\n"
-"     perversity typical of computer (and especially Unix and Linux)\n"
-"     nomenclature, the top of the tree is called the root directory,\n"
-"     and denoted by <systemitem><filename>/</filename></systemitem>.\n"
-"     The rest of the \"branches\" spread downwards from the root.  Don't\n"
-"     confuse the root directory with the <systemitem>root</systemitem>\n"
-"     account, or root's home directory,\n"
-"     <systemitem><filename>/home/root</filename></systemitem>.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"     Un forma de describir un conjunto de archivos en un ordenador.  Con\n"
-"     la especial perversión de la típica nomenclatura de ordenadores\n"
-"     (y especialmente en Unix y Linux), la parte más alta del árbol se\n"
-"     llama el directorio raíz, y se denota por <systemitem><filename>/\n"
-"     </filename></systemitem>.  El resto de las \"ramas\" se extienden\n"
-"     desde la raíz.  No confundir el directorio raíz (root en ingles) con\n"
-"     la cuenta <systemitem>root</systemitem>, o con el directorio del\n"
-"     usuario root, <systemitem><filename>/home/root</filename></"
-"systemitem>.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:91
-msgid ""
-"   <para>\n"
-"     Also called \"smileys,\" emoticons are the little sideways faces made\n"
-"     of colons and parentheses which people use to convey emotion in email.\n"
-"     Examples: :-) or ;(  .\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"     También llamados \"smileys\", los emoticones son pequeñas caras "
-"puestas\n"
-"     de lado echas de puntos y paréntesis que la gente usa para expresar\n"
-"     emociones en los correos electrónicos. Ejemplos: :-) ó ;(  .\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:97
-msgid ""
-"   <para>\n"
-"     An agreed-upon method of communication, especially one for\n"
-"     sending particular types of information between computer systems.\n"
-"     Examples include POP (Post Office Protocol), for email, and HTTP\n"
-"     (HypterText Transfer Protocol), for web pages.\n"
-"\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"     Un método de comunicación acordado, especialmente uno acordado para\n"
-"     enviar tipos particulares de información entre ordenadores\n"
-"     Ejemplos son POP (Protocolo de Oficina de Correo), para el correo, y\n"
-"     HTTP (Protocolo de Transferencia de Hipertexto), para páginas web.\n"
-"\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:105
-msgid ""
-"   <para>\n"
-"     Displayed as part of a message or other document, rather than\n"
-"     attached as a separate file. Contrast with <glossterm\n"
-"     linkend=\"attachment\">Attachment</glossterm>.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"     Mostrados como para de una mensaje u otro documento, en lugar de\n"
-"     incluido como un archivo separado. Contrasta con <glossterm\n"
-"     linkend=\"attachment\">Adjunto</glossterm>.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:111
-msgid ""
-"   <para>\n"
-"     POP, the Post Office Protocol, is a mechanism for email\n"
-"     transport.  In contrast to IMAP, it is used only to get mail from\n"
-"     a server and store it locally on your hard disk.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"     POP, el Protocolo de Oficina de Correos, es un mecanismo para el\n"
-"     transporte de correo.  En contraste con IMAP, solo se usa para obtener\n"
-"     el correo del servidor y almacenarlo localmente en el disco duro.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:117
-msgid ""
-"   <para>\n"
-"     Pre-sorting procedure that allows\n"
-"     <application>Evolution</application> to refer to data quickly.\n"
-"     It enables faster searches and decreases memory usage for\n"
-"     data displays.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"     El procedimiento de pre-ordenado que permite a\n"
-"     <application>Evolution</application> encontrar la información\n"
-"     rápidamente.  Permite búsquedas más rápidas y disminuye el uso de la\n"
-"     memoria para mostrar datos.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:124
-msgid ""
-"   <para>\n"
-"    <application>Evolution</application> is the <acronym> GNOME\n"
-"    </acronym> groupware application.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"    <application>Evolution</application> es la aplicación de trabajo en\n"
-"    grupo de <acronym>GNOME</acronym>.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:129
-msgid ""
-"   <para>\n"
-"    <application>Nautilus</application> is the next generation file\n"
-"    manager for <acronym>GNOME</acronym> being written by Eazel.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"    <application>Nautilus</application> es la próxima generación del\n"
-"    gestor de archivos de <acronym>GNOME</acronym> que está desarrollando\n"
-"    la compañía Eazel.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:134
-msgid ""
-"   <para>\n"
-"    <application>iCal</application> is the program which\n"
-"    <application>Evolution</application> uses to manage the calendar\n"
-"    section.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"    <application>iCal</application> es el programa que usa\n"
-"    <application>Evolution</application> para manejar la sección del\n"
-"    calendario.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:140
-msgid ""
-"   <para>\n"
-"    A file format for the exchange of contact information. When you\n"
-"    get an address card attached to an email, it's probably in vCard\n"
-"    format.  Not to be confused with <glossterm\n"
-"    linkend=\"vfolder\">vFolder</glossterm>.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"    Un formato de archivo para el intercambio de información de contactos.\n"
-"    Cuando recibe una tarjeta adjunta a un correo, esta probablemente en el\n"
-"    formato vCard.  No confundir con <glossterm\n"
-"    linkend=\"vfolder\">vFolder</glossterm>.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:147
-msgid ""
-"   <para>\n"
-"    A mail client is the application with which a person reads and\n"
-"    sends e-mail.  Its counterparts are the various types of mail\n"
-"    servers, which handle user authentication and direct messages from\n"
-"    sender to recipient.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"    Un cliente de correo es la aplicación con la que una persona lee y\n"
-"    envía correos electrónicos.  En el otro lado están los distintos tipos\n"
-"    de servidores de correo, que se encargan de autentificar al usuario\n"
-"    y dirigir los mensajes desde el remitente hasta el destinatario.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:154
-msgid ""
-"   <para>\n"
-"    A malicious program which inserts itself into others so that it will "
-"be \n"
-"    executed, allowing it to spread to still more programs and other "
-"computers.\n"
-"    A virus can cause substantial damage by clogging networks or disk "
-"drives, \n"
-"    deleting files, or opening security holes.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"    Un programa malicioso que se inserta a si mismo en otros para así ser \n"
-"    ejecutado, permitiéndole expandirse a más programas y a otros "
-"ordenadores.\n"
-"    Un virus puede causar daños sustanciales colapsando redes y unidades de "
-"disco, \n"
-"    borrando archivos, o abriendo agujeros de seguridad.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:161
-msgid ""
-"   <para>\n"
-"    A program written in an interpreted (rather than compiled)\n"
-"    language.  Often used as a synonym for \"macro,\" to denote a series\n"
-"    of pre-recorded commands or actions within an application.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"    Un programa escrito en un lenguaje interpretado (en lugar de\n"
-"    compilado).  A menudo usado como sinónimo de \"macro,\" para denotar\n"
-"    una serie de comando o acciones pre grabados en una aplicación.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:167
-msgid ""
-"   <para>\n"
-"    A tool which guides a user through a series of steps, usually to\n"
-"    configure or set up a program.  Equivalent to \"Assistant\" and\n"
-"    \"Wizard.\"\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"    Una herramienta que guía al usuario a través de una serie de pasos,\n"
-"    normalmente para configurar un programa.  Equivalente a \"Asistente\"\n"
-"    y \"Wizard\".\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:173
-msgid ""
-"   <para>\n"
-"    A way of addressing a message.  Bcc is used to send a group of\n"
-"    people an e-mail, while hiding their names and addresses from each\n"
-"    other.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"    Una manera de dirigir un mensaje.  Bcc es usado para enviar un mensaje\n"
-"    a un grupo de personas, a la vez que se ocultan los nombres y\n"
-"    direcciones de unos a los otros.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:179
-msgid ""
-"   <para>\n"
-"    An alias for an e-mail address.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"    Un alias para una dirección de correo electrónico.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:183
-msgid ""
-"   <para>\n"
-"    An email organization tool. vFolders allows you to create a folder\n"
-"    that contains the results of a complex search. Folder contents are\n"
-"    are updated dynamically.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"    Una herramienta para organizar mensajes. vFolders le permite crear una\n"
-"    carpeta que contiene los resultados de una búsqueda compleja.  Los\n"
-"    contenidos de la carpeta se actualizan dinámicamente.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:189
-msgid ""
-"   <para>\n"
-"    Any file sent along with an email.  Attachments may be embedded in\n"
-"    a message or appended to it.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"    Cualquier archivo enviado junto con el mensaje de correo.  Los adjuntos\n"
-"    pueden estar insertados dentro del mensaje o añadidos a el.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:194
-msgid ""
-"   <para>\n"
-"    Carbon-copies are used to send a 3rd party a copy of the e-mail,\n"
-"    so they an keep up to date on a conversation, without being in the\n"
-"    To: list.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"    Con-Copia es usado para enviar una copia del mensaje a una 3º persona,\n"
-"    para que puedan enterarse de la conversación, sin estar en la lista de\n"
-"    A:\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:200
-msgid ""
-"   <para>\n"
-"    Depending upon whom you ask, IMAP stands for the Internet Mail\n"
-"    Access Protocol, or the Interim Mail Access Protocol.  Whatever it\n"
-"    stands for, it allows access to email which is typically (although\n"
-"    not always) stored remotely on a server rather than on a local\n"
-"    hard disk.  Often contrasted with <glossterm>POP</glossterm>.\n"
-"    This will not be on the test.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"    Dependiendo a quien pregunte, IMAP significa Protocolo de Acceso al\n"
-"    Correo de Internet, o Protocolo de Acceso a Correo Interinamente.\n"
-"    Lo que sea que signifique, permite acceder al correo que está\n"
-"    típicamente (aunque no siempre) guardado remotamente en el servidor en\n"
-"    lugar de en el disco duro local.  Algunas veces contrasta con\n"
-"    <glossterm>POP</glossterm>.\n"
-"    Esto no estará en la prueba.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:209
-msgid ""
-"   <para>\n"
-"    Groupware is a term describing an application which helps groups\n"
-"    of people work together.  Typically, a groupware application will\n"
-"    have several productivity features built into one program.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"    Trabajo en Grupo es un término que describe la aplicación que ayuda a\n"
-"    grupos de persones a trabajar juntas.  Típicamente, esta aplicación\n"
-"    varias herramientas de productividad integradas en un mismo programa.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:215
-msgid ""
-"   <para>\n"
-"    Hot-keys are keyboard combinations used to do actions on a\n"
-"    computer instead of using the mouse to do the same action.\n"
-"    Hot-keys can speed up computer usage.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"    Teclas rápidas son combinaciones de teclado usadas para realizar\n"
-"    acciones en el ordenador en lugar de usar el ratón para la misma\n"
-"    acción. Las teclas rápidas pueden acelerar el uso del ordenador.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:221
-msgid ""
-"   <para>\n"
-"    Hyper-text Markup Language(<acronym>HTML</acronym>) is a language\n"
-"    for describing page layout in electronic documents like web pages,\n"
-"    help files, and email messages.  HTML can be used in email and\n"
-"    news posts to insert images and apply text treatments.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"    Lenguaje de Marcas de Hyper-texto (<acronym>HTML</acronym>) es un\n"
-"    lenguaje para describir la forma de la página en documentos "
-"electrónicos\n"
-"    como páginas web, archivos de ayuda, y mensajes de correo.  El HTML se\n"
-"    puede usar en el correo electrónico y en los grupos de noticias para\n"
-"    insertar imágenes o formatear el texto\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:228
-msgid ""
-"   <para>\n"
-"    To run a program.  Any file that can be run is called an\n"
-"    executable.  <application>Evolution</application> can download\n"
-"    executable attachments, but before they can be run, the files must\n"
-"    be marked as executable with a shell or file manager.  This\n"
-"    security precaution prevents the automatic or accidental execution\n"
-"    of malicious programs. For more information on executables and file\n"
-"    permissions, see the documentation for your file manager or shell.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"    Para ejecutar un programa.  Cualquier archivo que se puede ejecutar\n"
-"    se llama ejecutable.  <application>Evolution</application> puede\n"
-"    descargar ejecutables adjuntos, pero antes de poder ejecutarlos, el\n"
-"    archivo debe ser marcado como ejecutable a través de una shell o un\n"
-"    administrador de archivos.  Esta precaución de seguridad previene "
-"contra\n"
-"    la ejecución automática o accidental de programas maliciosos. Para más\n"
-"    información acerca de archivos ejecutables y permisos de archivos,\n"
-"    consulte la documentación de su administrador de archivos o de su "
-"shell.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:238
-msgid ""
-"   <para>\n"
-"    Useless, unsolicited e-mail.  Spam normally comes in forms of\n"
-"    chain letters and advertisements for unscrupulous or clueless\n"
-"    companies.  Messages that are merely useless are called \"opt-in\n"
-"    newsletters.\"\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"    Correo no deseado ó inútil.  El spam normalmente aparece como cartas\n"
-"    encadenadas y publicidad de compañías sin escrúpulos o sin sentido.\n"
-"    Los mensajes que no valen para nada se conocen como \"boletínes\n"
-"    opt-in\"\n"
-".   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:245
-msgid ""
-"   <para>\n"
-"    Within <application>Evolution</application>, a filter is a method\n"
-"    of sorting mail automatically.  You can create filters to perform\n"
-"    one or more actions on a message that meets any (or all) of a wide\n"
-"    range of criteria.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"    Dentro de <application>Evolution</application>, un filtro es un método\n"
-"    para ordenar el correo automáticamente.  Puede crear filtros para\n"
-"    realizar una o más acciones sobre un mensaje que cumple alguno (o "
-"todos)\n"
-"    de los requisitos de un amplio rango de criterios.\n"
-"   </para>\n"
-
-#: tmp/apx-gloss.sgml.h:252
-msgid "  <glossterm>Attachment</glossterm>\n"
-msgstr "  <glossterm>Adjunto</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:254
-msgid "  <glossterm>Automatic Indexing</glossterm>\n"
-msgstr "  <glossterm>Indexado Automático</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:256
-msgid "  <glossterm>Bcc (Blind Carbon Copy)</glossterm>\n"
-msgstr "  <glossterm>Cco (Con Copia Oculta)</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:258
-msgid "  <glossterm>Cc (Carbon Copy)</glossterm>\n"
-msgstr "  <glossterm>Cc (Con Copia)</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:260
-msgid "  <glossterm>Conduit</glossterm>\n"
-msgstr "  <glossterm>Enlaze</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:262
-msgid "  <glossterm>Druid</glossterm>\n"
-msgstr "  <glossterm>Ayudante</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:264
-msgid "  <glossterm>Emoticon</glossterm>\n"
-msgstr "  <glossterm>Emoticon</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:266
-msgid "  <glossterm>Evolution</glossterm>\n"
-msgstr "  <glossterm>Evolution</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:268
-msgid "  <glossterm>Execute</glossterm>\n"
-msgstr "  <glossterm>Ejecutar</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:270
-msgid "  <glossterm>File Tree</glossterm>\n"
-msgstr "  <glossterm>Árbol de Archivos</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:272
-msgid "  <glossterm>Filter</glossterm>\n"
-msgstr "  <glossterm>Filtro</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:274
-msgid "  <glossterm>Forward</glossterm>\n"
-msgstr "  <glossterm>Reenviar</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:276
-msgid "  <glossterm>HTML</glossterm>\n"
-msgstr "  <glossterm>HTML</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:278
-msgid "  <glossterm>Haiku</glossterm>\n"
-msgstr "  <glossterm>Haiku</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:280
-msgid "  <glossterm>Hot Key</glossterm>\n"
-msgstr "  <glossterm>Tecla Rápida</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:282
-msgid "  <glossterm>IMAP</glossterm>\n"
-msgstr "  <glossterm>IMAP</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:284
-msgid "  <glossterm>Inline</glossterm>\n"
-msgstr "  <glossterm>En línea</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:286
-msgid "  <glossterm>Mail Client</glossterm>\n"
-msgstr "  <glossterm>Cliente de Correo</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:288
-msgid "  <glossterm>Minicard</glossterm>\n"
-msgstr "  <glossterm>Minitarjeta</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:290
-msgid "  <glossterm>Nautilus</glossterm>\n"
-msgstr "  <glossterm>Nautilus</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:292
-msgid "  <glossterm>Nickname</glossterm>\n"
-msgstr "  <glossterm>Apodo</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:294
-msgid "  <glossterm>POP</glossterm>\n"
-msgstr "  <glossterm>POP</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:296
-msgid "  <glossterm>Protocol</glossterm>\n"
-msgstr "  <glossterm>Protocolo</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:298
-msgid "  <glossterm>Regular Expression</glossterm>\n"
-msgstr "  <glossterm>Expresión Regular</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:300
-msgid "  <glossterm>Script</glossterm>\n"
-msgstr "  <glossterm>Script</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:302
-msgid "  <glossterm>Sendmail</glossterm>\n"
-msgstr "  <glossterm>Sendmail</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:304
-msgid "  <glossterm>Shortcut Bar</glossterm>\n"
-msgstr "  <glossterm>Barra de Atajos</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:306
-msgid "  <glossterm>Spam</glossterm>\n"
-msgstr "  <glossterm>Spam</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:308
-msgid "  <glossterm>Tool-Tip</glossterm>\n"
-msgstr "  <glossterm>Mensaje de Ayuda</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:310
-msgid "  <glossterm>Virus</glossterm>\n"
-msgstr "  <glossterm>Virus</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:312
-msgid "  <glossterm>iCal</glossterm>\n"
-msgstr "  <glossterm>iCal</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:314
-msgid "  <glossterm>vCard</glossterm>\n"
-msgstr "  <glossterm>vCard</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:316
-msgid "  <glossterm>vFolder</glossterm>\n"
-msgstr "  <glossterm>vFolder</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:318
-msgid " <glossterm>Groupware</glossterm>\n"
-msgstr " <glossterm>Trabajo en Grupo</glossterm>\n"
-
-#: tmp/apx-gloss.sgml.h:320
-msgid " <title>Glossary</title>\n"
-msgstr " <title>Glosario</title>\n"
diff --git a/help/es.po/config-prefs.sgml.po b/help/es.po/config-prefs.sgml.po
deleted file mode 100644
index e83d4ff5c9..0000000000
--- a/help/es.po/config-prefs.sgml.po
+++ /dev/null
@@ -1,1364 +0,0 @@
-# Translation into Spanish of Evolution docs.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Héctor García Álvarez <hector@scouts-es.org>, 2000.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution-docs\n"
-"POT-Creation-Date: 2001-04-20 13:43+0200\n"
-"PO-Revision-Date: 2000-12-28 15:38+0100\n"
-"Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: tmp/config-prefs.sgml.h:1
-msgid ""
-"\t<para>\n"
-"            To use <guilabel>SMTP</guilabel>, you'll need to enter the\n"
-"            name of your SMTP server.  It may have the same name as\n"
-"            your mail source server.\n"
-"         </para>\n"
-msgstr ""
-"\t<para>\n"
-"            Para usar <guilabel>SMTP</guilabel>, necesitará introducir\n"
-"            el nombre de su servidor SMTP.  Puede que sea el mismo nombre\n"
-"            que el del servidor de su fuente de correo.\n"
-"         </para>\n"
-
-#: tmp/config-prefs.sgml.h:7
-msgid ""
-"\t<para>\n"
-"           The <interface>Mail Transports</interface> tab lets you set\n"
-"           how you will send mail.  Evolution currently supports two\n"
-"           mail transport options: <glossterm linkend=\"smtp\">SMTP</"
-"glossterm>, which\n"
-"           uses a remote mail server, and\n"
-"           <glossterm linkend=\"sendmail\">sendmail</glossterm>, which uses "
-"the\n"
-"           <application>sendmail</application> program on your local\n"
-"           system.  <application>Sendmail</application> is more\n"
-"           difficult to configure, but offers more flexibility than\n"
-"           <glossterm>SMTP</glossterm>.\n"
-"        </para>\n"
-msgstr ""
-"\t<para>\n"
-"           La pestaña <interface>Transporte del Correo</interface> le\n"
-"           permite especificar como enviará el correo.  Evolution\n"
-"           actualmente soporta dos tipos de transporte: <glossterm linkend="
-"\"smtp\">SMTP</glossterm>, el cual usa un\n"
-"           servidor de correo remoto, y\n"
-"           <glossterm linkend=\"sendmail\">sendmail</glossterm>, el cual usa "
-"el\n"
-"           programa <application>sendmail</application> de su sistema "
-"local.\n"
-"           <application>Sendmail</application> es más difícil de "
-"configurar,\n"
-"           pero ofrece más flexibilidad que\n"
-"           <glossterm>SMTP</glossterm>.\n"
-"        </para>\n"
-
-#: tmp/config-prefs.sgml.h:19
-msgid ""
-"\t<para>\n"
-"          Not everything fits neatly into categories.  This tab\n"
-"          contains some miscellaneous configurations that don't have\n"
-"          too much to do with each other.\n"
-"          <variablelist>\n"
-"\n"
-"             <varlistentry>\n"
-"                <term> \n"
-"                   <guilabel>Send messages in HTML format</guilabel>\n"
-"                </term>\n"
-"                <listitem><para>\n"
-"                    If you check this box, you will send\n"
-"                    messages as HTML by default.  If you leave it unchecked, "
-"your\n"
-"                    messages will be sent without HTML formatting unless you "
-"select \n"
-"                    <menuchoice> <guimenu>Format</guimenu> "
-"<guimenuitem>HTML</guimenuitem>\n"
-"                    </menuchoice> in the message composer.\n"
-"                    See <xref linkend=\"usage-mail-getnsend-send-html\">\n"
-"                    for more information about HTML mail.\n"
-"                </para></listitem>\n"
-"              </varlistentry>\n"
-"             <varlistentry>\n"
-"                <term> \n"
-"                   <guilabel>Mark Messages as Seen After</guilabel>\n"
-"                </term>\n"
-"                <listitem><para> \n"
-"                    When you click on a message,\n"
-"                    <application>Evolution</application> will wait a\n"
-"                    moment before marking it as seen. You can set the\n"
-"                    delay, in milliseconds, here.\n"
-"                 </para></listitem>\n"
-"              </varlistentry>\n"
-"              <varlistentry>\n"
-"                <term>\n"
-"                   <guilabel>Folder Format</guilabel>\n"
-"                </term>\n"
-"                <listitem> <para> By default,\n"
-"                   <application>Evolution</application> saves its mail\n"
-"                   in the\n"
-"                   <systemitem><filename>mbox</filename></systemitem>\n"
-"                   format. You can switch to the\n"
-"                   <systemitem><filename>mh</filename></systemitem>\n"
-"                   format if you like.  Note that this is an advanced\n"
-"                   feature and may cause you to lose some messages, so\n"
-"                   you should probably make a backup of your\n"
-"                   <systemitem><filename>evolution</filename></systemitem>\n"
-"                   directory first. In addition, it will take quite\n"
-"                   some time if you have a large mailbox.\n"
-"               </para></listitem>\n"
-"             </varlistentry>\n"
-"           </variablelist>\n"
-"        </para>\n"
-msgstr ""
-"\t<para>\n"
-"          No todo encaja bien en categorías.  Esta parte contiene\n"
-"          una miscelánea de configuraciones que no tienen demasiado que ver\n"
-"          unas con otras.\n"
-"          <variablelist>\n"
-"\n"
-"             <varlistentry>\n"
-"                <term> \n"
-"                   <guilabel>Enviar mensajes en formato HMTL</guilabel>\n"
-"                </term>\n"
-"                <listitem><para>\n"
-"                    Si selecciona esta opción, enviará sus\n"
-"                    mensajes en HTML por defecto.  Si no la selecciona, sus\n"
-"                    mensajes se enviarán sin formato HTML a menos que "
-"seleccione \n"
-"                    <menuchoice> <guimenu>Formato</guimenu> "
-"<guimenuitem>HTML</guimenuitem>\n"
-"                    </menuchoice> en la ventana de composición de mensajes.\n"
-"                    Vea <xref linkend=\"usage-mail-getnsend-send-html\">\n"
-"                    para más información acerca del correo en HTML.\n"
-"                </para></listitem>\n"
-"              </varlistentry>\n"
-"             <varlistentry>\n"
-"                <term> \n"
-"                   <guilabel>Marcar Mensajes como Leídos Pasados</guilabel>\n"
-"                </term>\n"
-"                <listitem><para> \n"
-"                    Cuando selecciona un mensaje,\n"
-"                    <application>Evolution</application> esperará un\n"
-"                    momento antes de marcarlo como leído. Puede poner el\n"
-"                    tiempo de espera, en milisegundos, aquí.\n"
-"                 </para></listitem>\n"
-"              </varlistentry>\n"
-"              <varlistentry>\n"
-"                <term>\n"
-"                   <guilabel>Formato de Carpeta</guilabel>\n"
-"                </term>\n"
-"                <listitem> <para> Por defecto,\n"
-"                   <application>Evolution</application> guarda el correo\n"
-"                   en el formato\n"
-"                   <systemitem><filename>mbox</filename></systemitem>.\n"
-"                   Si quiere puede cambiar al formato\n"
-"                   <systemitem><filename>mh</filename></systemitem>. Sepa\n"
-"                   que esta en una característica avanzada y que puede "
-"hacer\n"
-"                   que pierda algunos mensajes, así que probablemente\n"
-"                   primero debería hacer una copia de seguridad de su\n"
-"                   directorio <systemitem><filename>evolution</"
-"filename>                   </systemitem>\n"
-". Además, llevará bastante tiempo si tiene\n"
-"                   un mailbox grande.\n"
-"               </para></listitem>\n"
-"             </varlistentry>\n"
-"           </variablelist>\n"
-"        </para>\n"
-
-#: tmp/config-prefs.sgml.h:71
-msgid ""
-"\t<para>\n"
-"          The <interface>Mail Sources</interface> tab allows you to\n"
-"          edit, add, or delete methods of retrieving mail from\n"
-"          servers.  Clicking on <guibutton>Add</guibutton> or\n"
-"          <guibutton>Edit</guibutton> will bring up a dialog box to\n"
-"          offer you the following options:\n"
-"           <variablelist>\n"
-"\t    <varlistentry>\n"
-"\t      <term><guilabel>Mail source type:</guilabel></term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                  Select from <glossterm\n"
-"                  linkend=\"imap\">IMAP</glossterm> or <glossterm\n"
-"                  linkend=\"pop\">POP</glossterm> servers, or Unix-style\n"
-"                  <systemitem><filename>mbox</filename></systemitem>\n"
-"                  or <systemitem><filename>mh</filename></systemitem>\n"
-"                  files.\n"
-"                </para>\n"
-"\t      </listitem>\n"
-"\t    </varlistentry>\n"
-"\t    <varlistentry>\n"
-"\t      <term> <guilabel>Server:</guilabel></term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                  Enter the name of the mail source server in this\n"
-"                  field. If you use an  may or may not be the same as your\n"
-"                  <glossterm linkend=\"smtp\">SMTP</glossterm> server.\n"
-"                </para>\n"
-"\t      </listitem>\n"
-"\t    </varlistentry>\n"
-"\t    <varlistentry>\n"
-"\t      <term><guilabel>Username:</guilabel></term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                  Enter the user name for the account you have on the\n"
-"                  server-- this should the part of your email address\n"
-"                  before the @.  If you use\n"
-"                  <systemitem><filename>mbox</filename></systemitem>\n"
-"                  or <systemitem><filename>mh</filename></systemitem>\n"
-"                  files as your mail source, you do not need to enter\n"
-"                  a username.\n"
-"                </para>\n"
-"\t      </listitem>\n"
-"\t    </varlistentry>\n"
-"\t    <varlistentry>\n"
-"\t      <term><guilabel>Authentication:</guilabel></term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                  Tell <application>Evolution</application> how to\n"
-"                  verify your identity with the server.  Your options\n"
-"                  vary depending upon the type of server you are\n"
-"                  using, and the ways it is configured.  Given the\n"
-"                  name of a server,\n"
-"                  <application>Evolution</application> can detect what\n"
-"                  sorts of authentication it offers.\n"
-"               </para>\n"
-"\t      </listitem>\n"
-"\t    </varlistentry>\n"
-"\t    <varlistentry>\n"
-"\t      <term><guilabel>Test Settings</guilabel></term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                  Click this button to have\n"
-"                  <application>Evolution</application> check to see if\n"
-"                  mail sources are configured correctly.\n"
-"                </para>\n"
-"\t      </listitem>\n"
-"\t    </varlistentry>\n"
-"\t  </variablelist>\n"
-"          </para>\n"
-msgstr ""
-"\t<para>\n"
-"          La pestaña <interface>Fuentes de Correo</interface> le permite\n"
-"          editar, añadir, o borrar métodos de obtener el correo de los\n"
-"          servidores.  Pulsando en <guibutton>Añadir</guibutton> o\n"
-"          <guibutton>Editar</guibutton> aparecerá una caja de diálogo que\n"
-"          le ofrecerá las siguientes opciones:\n"
-"           <variablelist>\n"
-"\t    <varlistentry>\n"
-"\t      <term><guilabel>Tipo de Fuente de Correo:</guilabel></term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                  Seleccione entre servidores <glossterm\n"
-"                  linkend=\"imap\">IMAP</glossterm> o <glossterm\n"
-"                  linkend=\"pop\">POP</glossterm>, o archivos tipo\n"
-"                  <systemitem><filename>mbox</filename></systemitem>\n"
-"                  o <systemitem><filename>mh</filename></systemitem>\n"
-"                  al estilo Unix.\n"
-"                </para>\n"
-"\t      </listitem>\n"
-"\t    </varlistentry>\n"
-"\t    <varlistentry>\n"
-"\t      <term> <guilabel>Servidores:</guilabel></term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                  Introduzca el nombre del servidor de su fuente de correo\n"
-"                  en este campo. Si usa  puede o no que sea el mismo que su\n"
-"                  servidor <glossterm linkend=\"smtp\">SMTP</glossterm>.\n"
-"                </para>\n"
-"\t      </listitem>\n"
-"\t    </varlistentry>\n"
-"\t    <varlistentry>\n"
-"\t      <term><guilabel>Nombre de usuario:</guilabel></term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                  Introduzca el nombre para la cuenta que tiene en el\n"
-"                  servidor-- este debería ser la parte de delante de la @\n"
-"                  de su dirección de correo.  Si usa archivos\n"
-"                  <systemitem><filename>mbox</filename></systemitem>\n"
-"                  o <systemitem><filename>mh</filename></systemitem>\n"
-"                  como fuentes de correo, no necesita escribir un nombre de\n"
-"                  usuario.\n"
-"                </para>\n"
-"\t      </listitem>\n"
-"\t    </varlistentry>\n"
-"\t    <varlistentry>\n"
-"\t      <term><guilabel>Autentificación:</guilabel></term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                  Diga a <application>Evolution</application> como\n"
-"                  verificar su identidad con el servidor.  Sus opciones\n"
-"                  varían dependiendo del tipo de servidor que esté usando,\n"
-"                  y de la forma en que esté configurado.  Dado el nombre "
-"del\n"
-"                  servidor,\n"
-"                  <application>Evolution</application> puede detectar que\n"
-"                  tipos de autentificación ofrece.\n"
-"               </para>\n"
-"\t      </listitem>\n"
-"\t    </varlistentry>\n"
-"\t    <varlistentry>\n"
-"\t      <term><guilabel>Probar Configuración</guilabel></term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                  Pulse este botón para que\n"
-"                  <application>Evolution</application> compruebe si sus\n"
-"                  fuentes de correo están configuradas correctamente.\n"
-"                </para>\n"
-"\t      </listitem>\n"
-"\t    </varlistentry>\n"
-"\t  </variablelist>\n"
-"          </para>\n"
-
-#: tmp/config-prefs.sgml.h:142
-msgid ""
-"\t<para>\n"
-"          To set the behavior of your Contact Manager, click on the\n"
-"          <guibutton>Contact Manager</guibutton> tab in the\n"
-"          <interface>Preferences</interface> window.\n"
-"        </para>\n"
-msgstr ""
-"\t<para>\n"
-"          Para fijar el comportamiento de su Administrador de Contactos,\n"
-"          pulse en la pestaña\n"
-"          <guibutton>Administrador de Contactos</guibutton> en la ventana "
-"de\n"
-"          <interface>Preferencias</interface>.\n"
-"        </para>\n"
-
-#: tmp/config-prefs.sgml.h:148
-msgid ""
-"\t<para>\n"
-"          You can set the following options: <!--insert variable list\n"
-"          here-->\n"
-"        </para>\n"
-msgstr ""
-"\t<para>\n"
-"          Ha definido las siguientes opciones: <!--insertar aquí una lista\n"
-"          de variables-->\n"
-"        </para>\n"
-
-#: tmp/config-prefs.sgml.h:153
-msgid "\t<title>Mail Preferences Dialog</title>\n"
-msgstr "\t<title>Dialogo de Preferencias del Correo</title>\n"
-
-#: tmp/config-prefs.sgml.h:155
-msgid "\t<title>Mail Sources</title>\n"
-msgstr "\t<title>Fuentes del Correo</title>\n"
-
-#: tmp/config-prefs.sgml.h:157
-msgid "\t<title>Mail Transports</title>\n"
-msgstr "\t<title>Transportes del Correo</title>\n"
-
-#: tmp/config-prefs.sgml.h:159
-msgid "\t<title>Other Mail Preferences</title>\n"
-msgstr "\t<title>Otras Preferencias del Correo</title>\n"
-
-#: tmp/config-prefs.sgml.h:161
-msgid ""
-"           <para>\n"
-"              To add a new LDAP server to your available contact\n"
-"              folders, select <menuchoice> <guimenu>Actions</guimenu>\n"
-"              <guimenuitem>New Directory Server</guimenuitem>\n"
-"              </menuchoice>.  This brings up a small dialog box which\n"
-"              will let you enter the following options:\n"
-"              <itemizedlist>\n"
-"\t         <listitem><para>\n"
-"                    <guilabel>Name</guilabel> &mdash; any name you choose "
-"for the server.\n"
-"                 </para></listitem>\n"
-"\n"
-"                <listitem><para>\n"
-"                    <guilabel>Description</guilabel> &mdash; a longer "
-"description of the server.\n"
-"                 </para></listitem>\n"
-"\n"
-"                    <listitem><para>\n"
-"                    <guilabel>LDAP Server</guilabel> &mdash; the network "
-"address of the server.\n"
-"                 </para></listitem> \n"
-"               \n"
-"                   <listitem><para>\n"
-"                    <guilabel>Port Number</guilabel> &mdash; by default, the "
-"port number is 389.\n"
-"                 </para></listitem>\n"
-"\n"
-"                   <listitem><para>\n"
-"                    <guilabel>Root DN</guilabel> &mdash; enter the root DN "
-"here.\n"
-"                 </para></listitem>\n"
-"             </itemizedlist>\n"
-"         </para>\n"
-msgstr ""
-"           <para>\n"
-"              Para añadir un nuevo servidor LDAP a su carpeta de contactos\n"
-"              disponibles, selección <menuchoice><guimenu>Acciones</"
-"guimenu>\n"
-"              <guimenuitem>Nuevo Servidor de Directorio</guimenuitem>\n"
-"              </menuchoice>.  Esto mostrará una pequeña caja de diálogo que\n"
-"              le permitirá introducir los siguientes datos:\n"
-"              <itemizedlist>\n"
-"\t         <listitem><para>\n"
-"                    <guilabel>Nombre</guilabel> &mdash; cualquier nombre que "
-"elija para el servidor.\n"
-"                 </para></listitem>\n"
-"\n"
-"                <listitem><para>\n"
-"                    <guilabel>Descripción</guilabel> &mdash; un descripción "
-"larga del servidor.\n"
-"                 </para></listitem>\n"
-"\n"
-"                    <listitem><para>\n"
-"                    <guilabel>Servidor LDAP</guilabel> &mdash; la dirección "
-"de red del servidor.\n"
-"                 </para></listitem> \n"
-"               \n"
-"                   <listitem><para>\n"
-"                    <guilabel>Puerto</guilabel> &mdash; por defecto, el "
-"puerto es el 389.\n"
-"                 </para></listitem>\n"
-"\n"
-"                   <listitem><para>\n"
-"                    <guilabel>DN Raíz</guilabel> &mdash; entre el DN raíz "
-"aquí.\n"
-"                 </para></listitem>\n"
-"             </itemizedlist>\n"
-"         </para>\n"
-
-#: tmp/config-prefs.sgml.h:190
-msgid "           <title>Adding Directory Servers</title>\n"
-msgstr "           <title>Añadiendo Servidores de Directorio</title>\n"
-
-#: tmp/config-prefs.sgml.h:192
-msgid ""
-"          <para>\n"
-"            Click <guibutton>Add</guibutton> to add a news server; you\n"
-"            will be prompted for its name.  Enter the name, click\n"
-"            <guibutton>OK</guibutton>, and you're done.  You can have\n"
-"            as many mail servers as you like, of course.  News servers\n"
-"            will appear next to your IMAP servers in the\n"
-"            <interface>folder bar</interface>.\n"
-"          </para>\n"
-msgstr ""
-"          <para>\n"
-"            Pulse <guibutton>Añadir</guibutton> para añadir un servidor de\n"
-"            noticias, será preguntado por su nombre.  Introduzca el nombre,\n"
-"            pulse <guibutton>ACEPTAR</guibutton>, y ya está.  Naturalmente, "
-"puede\n"
-"            tener tantos servidores de noticias como desee.  Los servidores\n"
-"            de noticias aparecerán detrás de sus servidores IMAP en la\n"
-"            <interface>barra de carpetas</interface>.\n"
-"          </para>\n"
-
-#: tmp/config-prefs.sgml.h:201
-msgid ""
-"          <para>\n"
-"            If you have several mail sources, clicking <guibutton>Get\n"
-"            Mail</guibutton> will refresh any IMAP,\n"
-"            <systemitem><filename>mh</filename></systemitem>, or\n"
-"            <systemitem><filename>mbox</filename></systemitem>\n"
-"            listings and check and download mail from all POP servers.\n"
-"            In other words, <guibutton>Get Mail</guibutton> gets your\n"
-"            mail, no matter how many sources you have, or what types\n"
-"            they are.\n"
-"          </para>\n"
-msgstr ""
-"          <para>\n"
-"            Si tiene varias fuentes de correo, pulsando <guibutton>\n"
-"            Obtener</guibutton> actualizará cualquier carpeta IMAP,\n"
-"            <systemitem><filename>mh</filename></systemitem>, o\n"
-"            <systemitem><filename>mbox</filename></systemitem>\n"
-"            y comprobará y descargará el correo de todos los servidores "
-"POP.\n"
-"            En otras palabras, <guibutton>Obtener</guibutton> obtiene su\n"
-"            correo, sin importar cuantas fuentes tenga, o de que tipo sean.\n"
-"          </para>\n"
-
-#: tmp/config-prefs.sgml.h:212
-msgid ""
-"          <para>\n"
-"            Newsgroups are so much like mailing lists that there's no\n"
-"            reason not to keep them right next to your mail.  When you\n"
-"            first select the <guilabel>News Servers</guilabel> tab,\n"
-"            you will see a blank box with the three familiar buttons\n"
-"            on the right: <guibutton>Add</guibutton>,\n"
-"            <guibutton>Edit</guibutton>, and\n"
-"            <guibutton>Delete</guibutton>.\n"
-"          </para>\n"
-msgstr ""
-"          <para>\n"
-"            Los grupos de noticias se parecen tanto a listas de correo que\n"
-"            no hay ninguna razón para no tenerlos al lado de su correo.  La\n"
-"            primera vez que seleccione la pestaña <guilabel>Servidor de\n"
-"            Noticias</guilabel>, verá una caja vacía con tres botones ya\n"
-"            familiares a la derecha: <guibutton>Añadir</guibutton>,\n"
-"            <guibutton>Editar</guibutton>, y\n"
-"            <guibutton>Borrar</guibutton>.\n"
-"          </para>\n"
-
-#: tmp/config-prefs.sgml.h:222
-msgid "          <title>News Servers</title>\n"
-msgstr "          <title>Servidores de Noticias</title>\n"
-
-#: tmp/config-prefs.sgml.h:224
-msgid ""
-"         <para>\n"
-"            <application>Evolution</application> can attempt to\n"
-"            determine if you have entered a valid server name.  To\n"
-"            have it do so, click the <guilabel>Test\n"
-"            Settings</guilabel> button.\n"
-"         </para>\n"
-msgstr ""
-"         <para>\n"
-"            <application>Evolution</application> puede intentar\n"
-"            determinar si ha introducido un nombre de servidor válido.  "
-"Para\n"
-"            que lo haga, pulse el botón <guilabel>Comprobar\n"
-"            Configuración</guilabel>.\n"
-"         </para>\n"
-
-#: tmp/config-prefs.sgml.h:231
-msgid "         <title>Mail Settings</title>\n"
-msgstr "         <title>Configuración del Correo</title>\n"
-
-#: tmp/config-prefs.sgml.h:233
-msgid ""
-"        <para>\n"
-"        To change your mail settings, select <menuchoice>\n"
-"        <guimenu>Settings</guimenu> <guimenuitem>Mail\n"
-"        configuration</guimenuitem></menuchoice> in the Inbox.  This\n"
-"        will open the <interface>mail preferences window</interface>,\n"
-"        illustrated in <xref linkend=\"config-prefs-mail-fig\">.  Mail\n"
-"        preferences are separated into several categories:\n"
-"        <variablelist>\n"
-"\t<varlistentry>\n"
-"          <term><guilabel>Identities</guilabel></term>\n"
-"          <listitem>\n"
-"\t    <para>\n"
-"               This allows you to create and alter one or more\n"
-"               identities for your email.\n"
-"\t    </para>\n"
-"\t  </listitem>\n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"\t  <term><guilabel>Sources</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"               This tab lets you tell\n"
-"               <application>Evolution</application> where to get the\n"
-"               mail sent to you, and how to get it.\n"
-"            </para>\n"
-"          </listitem>\n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"\n"
-"\t  <term><guilabel>Mail Transport</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"               This tab lets you tell\n"
-"               <application>Evolution</application> how to send mail.\n"
-"            </para>\n"
-"          </listitem>\n"
-"\t</varlistentry>\n"
-"\n"
-"\t<varlistentry>\n"
-"\t  <term><guilabel>News Servers</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"              If you would like to use\n"
-"              <application>Evolution</application> to read newsgroups,\n"
-"              you can specify your news server preferences here.\n"
-"           </para>\n"
-"\t  </listitem>\n"
-"\t</varlistentry>\n"
-"\n"
-"\t<varlistentry>\n"
-"\t  <term><guilabel>Other</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"              Miscellaneous mail and news settings, such as HTML\n"
-"              handling preferences, and how long\n"
-"              <application>Evolution</application> should wait before\n"
-"              marking a message read.\n"
-"           </para>\n"
-"\t  </listitem>\n"
-"\t</varlistentry>\n"
-"      </variablelist>\n"
-"\n"
-"    </para>\n"
-msgstr ""
-"        <para>\n"
-"        Para cambiar su configuración de correo, seleccione <menuchoice>\n"
-"        <guimenu>Configuración</guimenu> <guimenuitem>Configuración\n"
-"        de correo</guimenuitem></menuchoice> estando en Inbox.  Esto\n"
-"        abrirá la <interface>ventana de preferencias del correo</"
-"interface>,\n"
-"        ilustrada en <xref linkend=\"config-prefs-mail-fig\">.  Las\n"
-"        preferencias de correo están separadas en varias categorías:\n"
-"        <variablelist>\n"
-"\t<varlistentry>\n"
-"          <term><guilabel>Identidades</guilabel></term>\n"
-"          <listitem>\n"
-"\t    <para>\n"
-"               Esto le permite crear o alterar una o más identidades para\n"
-"               su correo electrónico.\n"
-"\t    </para>\n"
-"\t  </listitem>\n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"\t  <term><guilabel>Fuentes</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"               Esta pestaña le permite indicar a\n"
-"               <application>Evolution</application> de donde obtener el\n"
-"               correo que le envíen y como obtenerlo.\n"
-"            </para>\n"
-"          </listitem>\n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"\n"
-"\t  <term><guilabel>Transporte de Correo</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"               Esta pestaña le permite indicar a\n"
-"               <application>Evolution</application> como enviar su correo.\n"
-"            </para>\n"
-"          </listitem>\n"
-"\t</varlistentry>\n"
-"\n"
-"\t<varlistentry>\n"
-"\t  <term><guilabel>Servidores de Noticias</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"              Si quisiera usar <application>Evolution</application> para\n"
-"              leer los grupos de noticias, puede especificar aquí las\n"
-"              características de su servidor de noticias..\n"
-"           </para>\n"
-"\t  </listitem>\n"
-"\t</varlistentry>\n"
-"\n"
-"\t<varlistentry>\n"
-"\t  <term><guilabel>Otros</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"              Configuración miscelánea para el correo y las noticias, como\n"
-"              el uso de HTML, y cuanto tiempo debe esperar\n"
-"              <application>Evolution</application> antes de marcar un\n"
-"              mensaje como leído.\n"
-"           </para>\n"
-"\t  </listitem>\n"
-"\t</varlistentry>\n"
-"      </variablelist>\n"
-"\n"
-"    </para>\n"
-
-#: tmp/config-prefs.sgml.h:297
-msgid ""
-"       <para>\n"
-"          To set your calendar preferences, select\n"
-"          <menuchoice><guimenu>Settings</guimenu>\n"
-"          <guimenuitem>Calendar\n"
-"          Configuration</guimenuitem></menuchoice> from the Calendar\n"
-"          view.  This will open up the\n"
-"          <interface>Preferences</interface> window.  It contains four\n"
-"          tabs: <guilabel>Time display</guilabel>,\n"
-"          <guilabel>Colors</guilabel>, <guilabel>To Do List</guilabel>\n"
-"          and <guilabel>Alarms</guilabel>.  The <interface>calendar\n"
-"          preferences window</interface> is illustrated in <xref\n"
-"          linkend=\"config-prefs-cal-fig\">.\n"
-"\n"
-"      <!-- ==============Figure===================== -->\n"
-"      <figure id=\"config-prefs-cal-fig\">\n"
-"\t<title>Calendar Preferences Dialog</title>\n"
-"\t<screenshot>\n"
-"\t  <screeninfo>If this worked on my job as well as my calendar...</"
-"screeninfo>\n"
-"\t  <graphic fileref=\"fig/config-cal\" format=\"png\" srccredit=\"Aaron "
-"Weber\">\n"
-"\t    </graphic>\n"
-"\t</screenshot>\n"
-"      </figure>\n"
-"      <!-- ==============End of Figure================-->\n"
-"        </para>\n"
-msgstr ""
-"       <para>\n"
-"          Para especificar sus preferencias sobre el calendario, selección\n"
-"          <menuchoice><guimenu>Configuraciones</guimenu>\n"
-"          <guimenuitem>Configuración del\n"
-"          Calendario</guimenuitem></menuchoice> desde la vista del\n"
-"          calendario.  Esto abrirá la ventana de\n"
-"          <interface>Preferencias</interface>.  Contiene cuatro pestañas:\n"
-"          <guilabel>Vista del tiempo</guilabel>,\n"
-"          <guilabel>Colores</guilabel>, <guilabel>Lista de Tareas</"
-"guilabel>\n"
-"          y <guilabel>Alarmas</guilabel>.  La <interface>ventana de\n"
-"          preferencias del calendario</interface> está ilustrada en <xref\n"
-"          linkend=\"config-prefs-cal-fig\">.\n"
-"\n"
-"      <!-- ==============Figure===================== -->\n"
-"      <figure id=\"config-prefs-cal-fig\">\n"
-"\t<title>Diálogo de Preferencias del Calendario</title>\n"
-"\t<screenshot>\n"
-"\t  <screeninfo>Si esto funcionase en mi trabajo también como en mi "
-"calendario...</screeninfo>\n"
-"\t  <graphic fileref=\"fig/config-cal\" format=\"png\" srccredit=\"Aaron "
-"Weber\">\n"
-"\t    </graphic>\n"
-"\t</screenshot>\n"
-"      </figure>\n"
-"      <!-- ==============End of Figure================-->\n"
-"        </para>\n"
-
-#: tmp/config-prefs.sgml.h:322
-msgid ""
-"       <para>\n"
-"         To add a new identity, simply click\n"
-"         <guibutton>Add</guibutton>. To alter an existing identity,\n"
-"         click on it in the <guilabel>Identity</guilabel> tab of the\n"
-"         <interface>Preferences</interface> window, and then click\n"
-"         <guibutton>Edit</guibutton>.\n"
-"      </para>\n"
-msgstr ""
-"       <para>\n"
-"         Para añadir una nueva identidad, simplemente pulse\n"
-"         <guibutton>Añadir</guibutton>. Para modificar una identidad\n"
-"         ya existente, seleccione la de la pestaña\n"
-"         <guilabel>Identidad</guilabel> de la ventana de\n"
-"         <interface>Preferencias</interface>, y pulse\n"
-"         <guibutton>Editar</guibutton>.\n"
-"      </para>\n"
-
-#: tmp/config-prefs.sgml.h:330
-msgid "       <title>Configuring the Calendar</title>\n"
-msgstr "       <title>Configuración del Calendario</title>\n"
-
-#: tmp/config-prefs.sgml.h:332
-msgid "      <!-- ==============End of Figure================-->\n"
-msgstr "      <!-- ==============End of Figure================-->\n"
-
-#: tmp/config-prefs.sgml.h:334
-msgid "      <!-- ==============Figure===================== -->\n"
-msgstr "      <!-- ==============Figure===================== -->\n"
-
-#: tmp/config-prefs.sgml.h:336
-msgid ""
-"      <para>\n"
-"         <application>Evolution</application> will then present you\n"
-"         with a dialog box containing four fields:\n"
-"          <itemizedlist>\n"
-"           <listitem>\n"
-"\t    <para>\n"
-"              <guilabel>Full Name:</guilabel> by default, this is the\n"
-"              same name as the full name described in your user\n"
-"              account on your computer.  You can select another if you\n"
-"              wish.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"           <listitem>\n"
-"\t    <para>\n"
-"              <guilabel>Email address:</guilabel> Enter your email\n"
-"              address in this space.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"           <listitem>\n"
-"\t    <para>\n"
-"              <guilabel>Organization:</guilabel> If you send email as\n"
-"              a representative of a company or other organization,\n"
-"              enter its name here.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"           <listitem>\n"
-"\t    <para>\n"
-"              <guilabel>Signature file:</guilabel> You may choose a\n"
-"              small text file to be appended to every message that you\n"
-"              send.  Typically, signature files include address or\n"
-"              other contact information, or a favorite quotation.\n"
-"              It's good form to keep it to four lines at the maximum.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"\t</itemizedlist>\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"         <application>Evolution</application> le presentará una caja de\n"
-"         dialogo que contiene cuatro campos:\n"
-"          <itemizedlist>\n"
-"           <listitem>\n"
-"\t    <para>\n"
-"              <guilabel>Nombre Completo:</guilabel> por defecto, este es el\n"
-"              mismo nombre que el nombre completo descrito en su cuenta de\n"
-"              usuario en su ordenador.  Puede seleccionar otro si lo desea.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"           <listitem>\n"
-"\t    <para>\n"
-"              <guilabel>Dirección de Correo:</guilabel> Escriba su "
-"dirección\n"
-"              de correo en este espacio.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"           <listitem>\n"
-"\t    <para>\n"
-"              <guilabel>Organización:</guilabel> Si envía mensajes en\n"
-"              representación de una compañía u otra organización,\n"
-"              escriba aquí el nombre de la misma.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"           <listitem>\n"
-"\t    <para>\n"
-"              <guilabel>Archivo de Firma:</guilabel> Puede elegir un\n"
-"              pequeño archivo de texto para que sea añadido a todos los\n"
-"              mensajes que mande.  Típicamente, los archivos de firma\n"
-"              incluyen la dirección u otra información de contacto, o su\n"
-"              cita preferida.  Es una buena costumbre hacer que no tenga\n"
-"              más de cuatro líneas.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"\t</itemizedlist>\n"
-"      </para>\n"
-
-#: tmp/config-prefs.sgml.h:373
-msgid ""
-"      <para>\n"
-"         If you have only one email account, or send email from only\n"
-"         one address, you will only need to configure one identity. If\n"
-"         you want, however, you can have multiple identities.  This\n"
-"         can be useful if you want to keep personal and professional\n"
-"         email separate, or if you wear several hats at work.\n"
-"         \n"
-"       </para>\n"
-msgstr ""
-"      <para>\n"
-"         Si solo tiene una cuenta de correo, o envía el correo desde una\n"
-"         sola dirección, tan solo deberá configurar una identidad. De todos\n"
-"         modos, si quiere puede tener múltiples identidades.  Esto puede\n"
-"         resultar útil si quiere mantener separados su correo personal y\n"
-"         profesional, o si tiene varios puestos en su trabajo.\n"
-"         \n"
-"       </para>\n"
-
-#: tmp/config-prefs.sgml.h:382
-msgid ""
-"      <para>\n"
-"        In order to send mail with\n"
-"        <application>Evolution</application>, you need to connect to\n"
-"        your network.  To do that, you'll need to know your user name\n"
-"        and password, what sort of mail sending and receiving\n"
-"        protocols your network uses, and the names of the servers\n"
-"        you'll be using.  If you're switching from another groupware\n"
-"        or email program, you can almost certainly use the same\n"
-"        settings as you did with that program. Network-related\n"
-"        settings are in the <guilabel>Mail Sources</guilabel> and\n"
-"        <guilabel>Mail Transport</guilabel> tabs.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        Para enviar correo con\n"
-"        <application>Evolution</application>, deberá conectarse a la red.\n"
-"        Para hacer esto deberá conocer su nombre de usuario y su clave, que\n"
-"        tipo de protocolos de recepción y envío usa su red, y los nombres\n"
-"        de los servidores que va a usar.  Si está migrando desde otro\n"
-"        programa de trabajo en grupo o de correo, casi con toda seguridad\n"
-"        podrá usar la misma configuración que en dicho programa. La\n"
-"        configuración relacionada con la Red se encuentra en las pestañas\n"
-"        <guilabel>Fuentes de Correo</guilabel> y\n"
-"        <guilabel>Transportes de Correo</guilabel>.\n"
-"      </para>\n"
-
-#: tmp/config-prefs.sgml.h:395
-msgid ""
-"      <para>\n"
-"        Perhaps your mail server has changed names.  Perhaps you've\n"
-"        grown tired of a certain layout for your appointments.\n"
-"        Whatever the reason, you want to change your\n"
-"        <application>Evolution</application> settings.  This chapter\n"
-"        will tell you how to do just that.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        Quizá su servidor de correo ha cambiado de nombre.  Quizá se ha\n"
-"        cansado de cierto aspecto de la configuración de sus citas.\n"
-"        Cualquiera que sea la razón, usted quiere cambiar su configuración\n"
-"        de <application>Evolution</application>.  Este capítulo le\n"
-"        dirá como hacer exactamente eso.\n"
-"      </para>\n"
-
-#: tmp/config-prefs.sgml.h:403
-msgid ""
-"      <para>\n"
-"        The <guilabel>Time display</guilabel> tab lets you set the\n"
-"        following:\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term>Time format</term>\n"
-"\t    <listitem>\n"
-"\t      <para>You may choose between twelve-hour (AM/PM) and\n"
-"\t      twenty-four hour time formats here by clicking the\n"
-"\t      appropriate radio button.\n"
-"              </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t  <varlistentry>\n"
-"\t    <term>Weeks start on</term>\n"
-"\t    <listitem>\n"
-"\t      <para>You can set weeks to start on Sunday or on Monday.</para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t  <varlistentry>\n"
-"\t    <term>Day range</term>\n"
-"\t    <listitem>\n"
-"               <para>\n"
-"                 When does your work day start, and when does it end?\n"
-"                 In the day and week views,\n"
-"                 <application>Evolution</application> displays all the\n"
-"                 hours in the range you select here, even if there are\n"
-"                 no appointments for those times.  Of course, you can\n"
-"                 still schedule an appointment outside of these hours,\n"
-"                 and if you do, the display will be extended to show\n"
-"                 it.\n"
-"               </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"       </para>\n"
-msgstr ""
-"      <para>\n"
-"        La pestaña <guilabel>mostrar el Tiempo</guilabel> le permite\n"
-"        configurar lo siguiente:\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term>Formato del tiempo</term>\n"
-"\t    <listitem>\n"
-"\t      <para>Puede elegir aquí entre los formatos de doce horas (AM/PM) y\n"
-"\t      de veinticuatro horas simplemente pulsando sobre el botón "
-"apropiado.\n"
-"              </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t  <varlistentry>\n"
-"\t    <term>La semana comienza</term>\n"
-"\t    <listitem>\n"
-"\t      <para>Puede fijar que las semanas comiencen en Domingos o "
-"en               Lunes.</para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t  <varlistentry>\n"
-"\t    <term>Rango diario</term>\n"
-"\t    <listitem>\n"
-"               <para>\n"
-"                 ¿Cuando comienza u jornada laboral y cuando termina?\n"
-"                 En la vista diaria y semanal,\n"
-"                 <application>Evolution</application> muestra todas las\n"
-"                 horas del rango que seleccione aquí, incluso si no hay\n"
-"                 citas a esas horas.  Naturalmente, podrá poner una cita\n"
-"                 fuera de estas horas, y si lo hace, la vista se extenderá\n"
-"                 para mostrarla.\n"
-"               </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"       </para>\n"
-
-#: tmp/config-prefs.sgml.h:440
-msgid ""
-"      <para>\n"
-"        The <interface>colors tab</interface> allows you to decide\n"
-"        what color your calendar will be.  The tab consists of a\n"
-"        sample calendar on the right and a list of ten items that can\n"
-"        be colored in different ways.  If you click on the color\n"
-"        button to the right of each item, you will bring up a\n"
-"        color-selector window where you can choose to alter that\n"
-"        color.  By clicking <guibutton>OK</guibutton> in the color\n"
-"        selection dialog, you can see the results of the color on the\n"
-"        sample calendar.\n"
-"     </para>\n"
-msgstr ""
-"      <para>\n"
-"        La pestaña de <interface>colores</interface> le permite decidir\n"
-"        de que color será su calendario.  La pestaña consiste en un\n"
-"        calendario de ejemplo a la derecha y de una lista de diez elementos\n"
-"        que pueden ser coloreados en diferentes formas.  Si pulsa en botón\n"
-"        de color a la derecha de cada elemento, mostrará una ventana de\n"
-"        selección de color donde podrá elegir a que color cambiar el\n"
-"        elemento.  Pulsando <guibutton>ACEPTAR</guibutton> en el diálogo de\n"
-"        selección de colores, puede ver os resultados de los colores en el\n"
-"        calendario de ejemplo.\n"
-"     </para>\n"
-
-#: tmp/config-prefs.sgml.h:452
-msgid ""
-"      <para>  \n"
-"        The <interface>alarms tab</interface> enables you to select from "
-"three boxes:\n"
-"        <itemizedlist>\n"
-"\t  <listitem>\n"
-"\t    <para><guilabel>Beep on display alarms</guilabel>: select\n"
-"\t    this box to have <application>Evolution</application> beep\n"
-"\t    at you for any alarms you have set.  If you leave this box\n"
-"\t    unchecked, <application>Evolution</application> will only\n"
-"\t    alert you to events by opening a dialog box. These beeps\n"
-"\t    are distinct from full-fledged audio alarms.\n"
-"           </para>\n"
-"\t  </listitem>\n"
-"\t  <listitem>\n"
-"\t    <para><guilabel>Audio alarms timeout after: </guilabel>\n"
-"\t    Select this button to have your audio alarms stop\n"
-"\t    automatically after a certain number of seconds.  </para>\n"
-"\t  </listitem>\n"
-"\t  <listitem>\n"
-"\t    <para><guilabel>Enable snoozing for:</guilabel> If you\n"
-"\t    would like to have the option to tell\n"
-"\t    <application>Evolution</application> to repeat an alarm in\n"
-"\t    a few minutes, select this button and decide how long\n"
-"\t    you'd like it to wait.\n"
-"           </para>\n"
-"\t  </listitem>\n"
-"\t</itemizedlist>   \n"
-"      </para>\n"
-msgstr ""
-"      <para>  \n"
-"        La pestaña de <interface>alarmas</interface> le da la posibilidad de "
-"elegir entre tres opciones:\n"
-"        <itemizedlist>\n"
-"\t  <listitem>\n"
-"\t    <para><guilabel>Pitar al mostrar las alarmas</guilabel>: seleccione\n"
-"\t    esta opción para que <application>Evolution</application> emita un\n"
-"\t    pitido para la alarma que haya fijado.  Si deja esta opción sin\n"
-"\t    marcar, <application>Evolution</application> tan solo le alertará de\n"
-"\t    los sucesos abriendo un ventana de diálogo. Estos pitidos son\n"
-"\t    distintos a los de las alarmas auditivas.\n"
-"           </para>\n"
-"\t  </listitem>\n"
-"\t  <listitem>\n"
-"\t    <para><guilabel>Las alarmas auditivas cesan tras: </guilabel>\n"
-"\t    Seleccione esta opción para que las alarmas auditivas cesen\n"
-"\t    automáticamente pasados un número determinado de segundos.  </para>\n"
-"\t  </listitem>\n"
-"\t  <listitem>\n"
-"\t    <para><guilabel>Activar recordatorio para:</guilabel> Si quiere\n"
-"\t    tener la posibilidad de decirle a\n"
-"\t    <application>Evolution</application> que repita la alarma en unos\n"
-"\t    minutos, elija esta opción y decida cuanto tiempo quiere que espere\n"
-"\t    antes de repetirla.\n"
-"           </para>\n"
-"\t  </listitem>\n"
-"\t</itemizedlist>   \n"
-"      </para>\n"
-
-#: tmp/config-prefs.sgml.h:480
-msgid "      <title>Advanced Configuration</title>\n"
-msgstr "      <title>Configuración Avanzada</title>\n"
-
-#: tmp/config-prefs.sgml.h:482
-msgid "      <title>Alarms Settings</title>\n"
-msgstr "      <title>Colocación de Alarmas</title>\n"
-
-#: tmp/config-prefs.sgml.h:484
-msgid "      <title>Calendar Colors</title>\n"
-msgstr "      <title>Colores del Calendario</title>\n"
-
-#: tmp/config-prefs.sgml.h:486
-msgid "      <title>Identity Settings</title> \n"
-msgstr "      <title>Configuración de Identidades</title> \n"
-
-#: tmp/config-prefs.sgml.h:488
-msgid "      <title>Managing the Contact Manager</title>\n"
-msgstr "      <title>Administrando el Administrador de Contactos</title>\n"
-
-#: tmp/config-prefs.sgml.h:490
-msgid "      <title>Network Settings</title> \n"
-msgstr "      <title>Configuración de la Red</title> \n"
-
-#: tmp/config-prefs.sgml.h:492
-msgid "      <title>Time Display Settings</title>\n"
-msgstr "      <title>Configuración de las Vistas del Tiempo</title>\n"
-
-#: tmp/config-prefs.sgml.h:494
-msgid "      <title>To Do List Settings</title>\n"
-msgstr "      <title>Configuración de la Lista de Tareas Por-Hacer</title>\n"
-
-#: tmp/config-prefs.sgml.h:496
-msgid ""
-"     <para>\n"
-"       You can choose what information the To Do list displays and the\n"
-"       way it is displayed.  The two areas of the <interface>To Do\n"
-"       List</interface> tab offer several options each:\n"
-"       <variablelist>\n"
-"\t <varlistentry>\n"
-"\t   <term>Show on To Do List</term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"                This box contains three items.  If you select the\n"
-"                check boxes next to them, that information will appear\n"
-"                in the To Do list for each task it contains:\n"
-"                <itemizedlist>\n"
-"                  <listitem>\n"
-"\t\t    <para><guilabel>Due Date</guilabel></para>\n"
-"                   </listitem>\n"
-"                  <listitem>\n"
-"\t\t    <para><guilabel>Time Until Due</guilabel></para>\n"
-"                   </listitem>\n"
-"                  <listitem>\n"
-"\t\t    <para><guilabel>Priority</guilabel></para>\n"
-"                   </listitem>\n"
-"               </itemizedlist>\n"
-"               </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t  <varlistentry>\n"
-"\t    <term>Style Options</term>\n"
-"\t    <listitem>\n"
-"               <para>\n"
-"                 Select among the following checkboxes to determine\n"
-"                 how your To Do list will look:\n"
-"                <itemizedlist>\n"
-"                  <listitem>\n"
-"\t\t    <para><guilabel>Highlight overdue items</guilabel></para>\n"
-"                   </listitem>\n"
-"                  <listitem>\n"
-"\t\t    <para><guilabel>Highlight items due today</guilabel></para>\n"
-"                   </listitem>\n"
-"                  <listitem>\n"
-"\t\t    <para><guilabel>Highlight not yet due items</guilabel></para>\n"
-"                   </listitem>\n"
-"               </itemizedlist>                 \n"
-"               </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-msgstr ""
-"     <para>\n"
-"       Puede elegir que información muestra la lista Por Hacer y la manera\n"
-"       como la muestra.  Las dos áreas de la pestaña <interface>Lista Por\n"
-"       Hacer</interface> ofrecen varias opciones cada una:\n"
-"       <variablelist>\n"
-"\t <varlistentry>\n"
-"\t   <term>Mostrar en la Lista Por Hacer</term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"                Esta opción contiene tres elementos.  Si marca las casillas\n"
-"                a su lado, esa información aparecerá en la lista Por Hacer\n"
-"                para cada tarea que contenga:\n"
-"                <itemizedlist>\n"
-"                  <listitem>\n"
-"\t\t    <para><guilabel>Fecha de Plazo</guilabel></para>\n"
-"                   </listitem>\n"
-"                  <listitem>\n"
-"\t\t    <para><guilabel>Tiempo hasta el Plazo</guilabel></para>\n"
-"                   </listitem>\n"
-"                  <listitem>\n"
-"\t\t    <para><guilabel>Prioridad</guilabel></para>\n"
-"                   </listitem>\n"
-"               </itemizedlist>\n"
-"               </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t  <varlistentry>\n"
-"\t    <term>Opciones de Estilo</term>\n"
-"\t    <listitem>\n"
-"               <para>\n"
-"                 Seleccione entre las siguientes casillas para determinar\n"
-"                 que aspecto tendrá la lista Por Hacer:\n"
-"                <itemizedlist>\n"
-"                  <listitem>\n"
-"\t\t   <para><guilabel>Resaltar elementos fuera de plazo</guilabel></para>\n"
-"                   </listitem>\n"
-"                  <listitem>\n"
-"\t\t   <para><guilabel>Resaltar elementos de plazo hoy</guilabel></para>\n"
-"                   </listitem>\n"
-"                  <listitem>\n"
-"\t\t   <para><guilabel>Resaltar elementos dentro del plazo</guilabel></"
-"para>\n"
-"                   </listitem>\n"
-"               </itemizedlist>                 \n"
-"               </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-
-#: tmp/config-prefs.sgml.h:545
-msgid ""
-"     <para>The display elements whose color you can set are:\n"
-"\n"
-"          <itemizedlist>\n"
-"           <listitem>\n"
-"              <para>\n"
-"                <guilabel>Outline:</guilabel> The lines between days\n"
-"                and at the top of the display.\n"
-"              </para>\n"
-"            </listitem>\n"
-"\n"
-"           <listitem>\n"
-"              <para> <guilabel>Headings:</guilabel> Text color for day\n"
-"                and month names and other headings.\n"
-"              </para>\n"
-"            </listitem>\n"
-"\n"
-"           <listitem>\n"
-"              <para> <guilabel>Empty days:</guilabel> This is the\n"
-"                background color for any time slots in which you have no "
-"appointments.\n"
-"               </para>\n"
-"            </listitem>  \n"
-"\n"
-"         <listitem>\n"
-"              <para>         \n"
-"             <guilabel>Appointments:</guilabel> This is the\n"
-"                background color for any time slots in which you have "
-"appointments.\n"
-"               </para>\n"
-"            </listitem>\n"
-"     \n"
-"\t  <listitem>\n"
-"\t    <para> <guilabel>Highlighted day:</guilabel> The\n"
-"              background color for a selected time slot.\n"
-"             </para>\n"
-"\t  </listitem>\n"
-"\n"
-"          \n"
-"\t  <listitem>\n"
-"\t    <para>         \n"
-"              <guilabel>Day numbers:</guilabel> Text color for date "
-"numbers.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"\n"
-"              \n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"              <guilabel>Current day's number:</guilabel> Text color for "
-"today's date.\n"
-"             </para>\n"
-"\t  </listitem>\n"
-"\n"
-"\t  <listitem>\n"
-"\t    <para> <guilabel>To-Do item that is not yet\n"
-"             due:</guilabel> Text color for To-Do list items that are\n"
-"             not yet due.  (Or maybe background color? find out!)\n"
-"               </para>\n"
-"\t  </listitem>\n"
-"\n"
-"\n"
-"\t  <listitem>\n"
-"\t    <para> <guilabel>To-Do item that is due today:</guilabel>\n"
-"             Text color for today's tasks.\n"
-"               </para>\n"
-"\t  </listitem>\n"
-"\n"
-"\t  <listitem>\n"
-"\t    <para> <guilabel>To-Do item that is overdue:</guilabel>\n"
-"             Text color for overdue tasks.\n"
-"               </para>\n"
-"\t  </listitem>\n"
-"\n"
-"          </itemizedlist>\n"
-"        </para>\n"
-msgstr ""
-"     <para>Los elementos a mostrar cuyos colores puede fijar son:\n"
-"\n"
-"          <itemizedlist>\n"
-"           <listitem>\n"
-"              <para>\n"
-"                <guilabel>Marco:</guilabel> Las líneas entre los días y la\n"
-"                parte de arriba de la vista.\n"
-"              </para>\n"
-"            </listitem>\n"
-"\n"
-"           <listitem>\n"
-"              <para> <guilabel>Títulos:</guilabel> Color del texto para los\n"
-"                nombres de los días y los meses y para otros títulos.\n"
-"              </para>\n"
-"            </listitem>\n"
-"\n"
-"           <listitem>\n"
-"              <para> <guilabel>Días vacíos:</guilabel> Este es el color de\n"
-"                fondo para cualquier espacio de tiempo en el que no tiene "
-"citas.\n"
-"               </para>\n"
-"            </listitem>  \n"
-"\n"
-"         <listitem>\n"
-"              <para>         \n"
-"             <guilabel>Citas:</guilabel> Este es el color de fondo para\n"
-"                cualquier espacio de tiempo en el que tenga citas.\n"
-"               </para>\n"
-"            </listitem>\n"
-"     \n"
-"\t  <listitem>\n"
-"\t    <para> <guilabel>Día resaltado:</guilabel> El color de fondo\n"
-"              para un espacio de tiempo seleccionado.\n"
-"             </para>\n"
-"\t  </listitem>\n"
-"\n"
-"          \n"
-"\t  <listitem>\n"
-"\t    <para>         \n"
-"              <guilabel>Números de los días:</guilabel> Color del texto para "
-"los números de las fechas.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"\n"
-"              \n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"              <guilabel>Número del día actual:</guilabel> Color del texto "
-"para la fecha del día de hoy.\n"
-"             </para>\n"
-"\t  </listitem>\n"
-"\n"
-"\t  <listitem>\n"
-"\t    <para> <guilabel>Elementos Por Hacer que dentro de plazo:\n"
-"             </guilabel> Color del texto para los elementos de la lista Por\n"
-"             Hacer que están aún dentro del plazo.\n"
-"             (¿Quizá sea el color de fondo? ¡averígualo!)\n"
-"               </para>\n"
-"\t  </listitem>\n"
-"\n"
-"\n"
-"\t  <listitem>\n"
-"\t    <para> <guilabel>Elementos Por Hacer de plazo hoy:</guilabel>\n"
-"             Color del texto para las tareas de hoy.\n"
-"               </para>\n"
-"\t  </listitem>\n"
-"\n"
-"\t  <listitem>\n"
-"\t    <para> <guilabel>Elementos Por Hacer fuera de plazo:</guilabel>\n"
-"             Color del texto para las tareas fuera de plazo.\n"
-"               </para>\n"
-"\t  </listitem>\n"
-"\n"
-"          </itemizedlist>\n"
-"        </para>\n"
-
-#: tmp/config-prefs.sgml.h:617
-msgid ""
-"    <para>\n"
-"          Additional configuration options will be covered here, as\n"
-"          they become available.\n"
-"        </para>\n"
-msgstr ""
-"    <para>\n"
-"          Las opciones adicionales de configuración se cubrirán aquí,\n"
-"          según vayan estando disponibles.\n"
-"        </para>\n"
-
-#: tmp/config-prefs.sgml.h:622
-msgid "    <title>General Preferences</title> \n"
-msgstr "    <title>Preferencias Generales</title> \n"
-
-#: tmp/config-prefs.sgml.h:624
-msgid ""
-"<!-- <!DOCTYPE Chapter PUBLIC \"-//GNOME//DTD DocBook PNG Variant V1.1//EN"
-"\"> -->\n"
-msgstr ""
-"<!-- <!DOCTYPE Chapter PUBLIC \"-//GNOME//DTD DocBook PNG Variant V1.1//EN"
-"\"> -->\n"
diff --git a/help/es.po/config-setupassist.sgml.po b/help/es.po/config-setupassist.sgml.po
deleted file mode 100644
index aac50943ec..0000000000
--- a/help/es.po/config-setupassist.sgml.po
+++ /dev/null
@@ -1,446 +0,0 @@
-# Translation into Spanish of Evolution docs.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Héctor García Álvarez <hector@scouts-es.org>, 2000.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution-docs\n"
-"POT-Creation-Date: 2001-04-20 13:43+0200\n"
-"PO-Revision-Date: 2000-12-28 15:38+0100\n"
-"Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: tmp/config-setupassist.sgml.h:1
-msgid ""
-"      <para>\n"
-"         The setup assistant (sometimes called a\n"
-"\t <glossterm>Druid</glossterm>, by analogy with the \"Wizards\"\n"
-"\t that some other programs use) will guide you through the\n"
-"\t network configuration process.  It will ask you for some\n"
-"\t basic information; your system administrator or ISP should\n"
-"\t have the answers you'll need.  The mail setup assistant is\n"
-"\t pictured in <xref linkend=\"usage-setup-fig\">.\n"
-"\n"
-"<!-- ==============Figure=================================== -->\n"
-"<!-- druid-pic should eventually become assistant-pic -->\n"
-"\n"
-"\t<figure id=\"usage-setup-fig\">\n"
-"\t<title>Mail Setup Assistant</title>\n"
-"\t<screenshot>\n"
-"\t  <screeninfo>Evolution Main Window</screeninfo>\n"
-"\t  <graphic fileref=\"fig/mail-druid-pic\" format=\"png\" srccredit=\"Kevin "
-"Breit\">\n"
-"\t    </graphic>\n"
-"\t</screenshot>\n"
-"\t</figure>\n"
-"<!-- ==============End of Figure=================================== -->\n"
-"\n"
-"\n"
-"\n"
-"  The assistant will ask you for the following information:\n"
-"        <variablelist>\n"
-"\n"
-"          <varlistentry>\n"
-"               <term> <guilabel>Name:</guilabel> </term> <listitem>\n"
-"\t  <para>Your full name. </para></listitem>\n"
-"         </varlistentry>\n"
-"\n"
-"       <varlistentry>\n"
-"          <term><guilabel>Email address:</guilabel></term>\n"
-"\t  <listitem><para>\n"
-"                 Your complete email address.\n"
-"                 </para></listitem>\n"
-"       </varlistentry>\n"
-"\n"
-"       <varlistentry>\n"
-"          <term> <guilabel>Organization:</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"              Any organization you represent, or the company where you\n"
-"              work.  Leave this blank if you wish, or type \"My own bad\n"
-"              self\" so people know your opinions are yours alone.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"      </varlistentry>\n"
-"\n"
-"      <varlistentry>\n"
-"\t <term><guilabel>Signature File:</guilabel></term>\n"
-"          <listitem>\n"
-"            <para>\n"
-"             A text file appended to any email you send.  A signature\n"
-"             file typically consists of your name and email address,\n"
-"             or a quotation you like.  It's good form to keep your\n"
-"             \"sig\" on the short side: four lines is plenty. Remember,\n"
-"             this is attached to every email you send.\n"
-"            </para>\n"
-"         </listitem>\n"
-"       </varlistentry>\n"
-"\n"
-"       <varlistentry>\n"
-"           <term> <guilabel>Mail source type:</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"              <application>Evolution</application> supports several\n"
-"              mail sources: <glossterm linkend=\"pop\">POP</glossterm> and\n"
-"              <glossterm linkend=\"imap\">IMAP</glossterm> servers, and UNIX-"
-"style\n"
-"              <systemitem><filename>mbox</filename></systemitem> and\n"
-"              <systemitem><filename>mh</filename></systemitem> files.\n"
-"              POP servers retrieve your mail and store it on your\n"
-"              local system so you can refer to it even when not\n"
-"              connected to a network; <glossterm>IMAP</glossterm>\n"
-"              servers store the mail on the server so you can access\n"
-"              it from multiple locations;\n"
-"              <systemitem><filename>mbox</filename>></systemitem>\n"
-"              files are used by your computer for internal mail, and\n"
-"              may be useful if you want to switch from another email\n"
-"              client such as <application>Spruce</application> or\n"
-"              <application>Netscape Communicator</application>.  Ask\n"
-"              your system administrator which you should use, or keep\n"
-"              guessing until one works.  You may use multiple sources\n"
-"              if you wish; see <xref\n"
-"              linkend=\"config-prefs-mail-network\"> for more\n"
-"              information.\n"
-"            </para>\n"
-"            <para>\n"
-"              If you decide not to have\n"
-"              <application>Evolution</application> use any servers,\n"
-"              the remaining items are not relevant; you only need to\n"
-"              point to the location of the files you wish to access.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"\t  </varlistentry>\n"
-"          \n"
-"       <varlistentry>\n"
-"          <term> <guilabel>Server:</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"              This should be the name of the server where you get\n"
-"              incoming mail.  It may (or may not) be the same as the\n"
-"              server where you send your outgoing mail.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"\t</varlistentry>\n"
-"\n"
-"     <varlistentry>\n"
-"\t  <term><guilabel>Username:</guilabel></term>\n"
-"\t<listitem>\n"
-"             <para>\n"
-"              Enter the username for your mail server account, if you\n"
-"              have one. In almost all cases, this is the part of your email\n"
-"              address before the @ character, and\n"
-"              <application>Evolution</application> has selected that\n"
-"              value as the default.  If you have a different username,\n"
-"              you can enter it here.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"      </varlistentry>\n"
-"     \n"
-"       <varlistentry>\n"
-"            <term><guilabel>Authentication:</guilabel></term> \n"
-"\t    <listitem>\n"
-"\t    <para>\n"
-"              Select the type of authentication you will use.  You can\n"
-"              click <guibutton>Detect supported types</guibutton> to\n"
-"              find out which authentication protocols your network\n"
-"              allows.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"       </varlistentry>\n"
-"\n"
-"      <varlistentry> \n"
-"         <term><guilabel>Mail Transport:</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"              This is the mail sending protocol you will want to use.\n"
-"              <application>Evolution</application> supports both\n"
-"              <glossterm linkend=\"smtp\">SMTP</glossterm> and\n"
-"              <application>sendmail</application>; SMTP is by far the\n"
-"              more common.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"      </varlistentry>\n"
-"     </variablelist>\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"         El asistente para la configuración (algunas veces llamado \n"
-"\t <glossterm>Druida</glossterm>, por analogía con los \"Magos\"\n"
-"\t que usan otros programas) le guiará a través del proceso de "
-"configuración\n"
-"\t de la red.  Le preguntará acerca de alguna información básica. Su\n"
-"\t administrador de sistemas o su proveedor de Internet debería tener\n"
-"\t las respuestas que necesitará.  El asistente para la configuración del\n"
-"\t correo está representado en <xref linkend=\"usage-setup-fig\">.\n"
-"\n"
-"<!-- ==============Figure=================================== -->\n"
-"<!-- druid-pic should eventually become assistant-pic -->\n"
-"\n"
-"\t<figure id=\"usage-setup-fig\">\n"
-"\t<title>Asistente para la Configuración del Correo</title>\n"
-"\t<screenshot>\n"
-"\t  <screeninfo>Ventana del Correo de Evolution</screeninfo>\n"
-"\t  <graphic fileref=\"fig/mail-druid-pic\" format=\"png\" srccredit=\"Kevin "
-"Breit\">\n"
-"\t    </graphic>\n"
-"\t</screenshot>\n"
-"\t</figure>\n"
-"<!-- ==============End of Figure=================================== -->\n"
-"\n"
-"\n"
-"\n"
-"  El asistente le pedirá la siguiente información:\n"
-"        <variablelist>\n"
-"\n"
-"          <varlistentry>\n"
-"               <term> <guilabel>Nombre:</guilabel> </term> <listitem>\n"
-"\t  <para>Su nombre completo. </para></listitem>\n"
-"         </varlistentry>\n"
-"\n"
-"       <varlistentry>\n"
-"          <term><guilabel>Dirección de correo electrónico:</guilabel></"
-"term>\n"
-"\t  <listitem><para>\n"
-"                 Su dirección de correo completa.\n"
-"                 </para></listitem>\n"
-"       </varlistentry>\n"
-"\n"
-"       <varlistentry>\n"
-"          <term> <guilabel>Organización:</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"           Cualquier organización a la que represente, o la compañía para\n"
-"           la que trabaja.  Deje esto en blanco si lo prefiere, o ponga\n"
-"           \"Yo mismo\" así la gente sabrá que sus opiniones son solo "
-"suyas.\n"
-"           </para>\n"
-"\t  </listitem>\n"
-"      </varlistentry>\n"
-"\n"
-"      <varlistentry>\n"
-"\t <term><guilabel>Archivo de Firma:</guilabel></term>\n"
-"          <listitem>\n"
-"            <para>\n"
-"             Un archivo de texto añadido a cualquier mensaje que envíe. Una\n"
-"             firma típica consiste en su nombre y su dirección de correo,\n"
-"             o una cita que le guste.  Es una buena medida mantener su\n"
-"             \"firma\" corta: cuatro líneas son suficientes. Recuerde,\n"
-"             que esto se adjuntará a todos los mensajes que envíe.\n"
-"            </para>\n"
-"         </listitem>\n"
-"       </varlistentry>\n"
-"\n"
-"       <varlistentry>\n"
-"           <term> <guilabel>Tipo de fuente del correo:</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"              <application>Evolution</application> soporta varias fuentes\n"
-"              para el correo: servidores <glossterm \n"
-"              linkend=\"pop\">POP</glossterm> e <glossterm \n"
-"              linkend=\"imap\">IMAP</glossterm>, y archivos \n"
-"              <systemitem><filename>mbox</filename></systemitem> y\n"
-"              <systemitem><filename>mh</filename></systemitem> al estilo "
-"UNIX.\n"
-"              Los servidores POP le permiten obtener su correo y guardarlo\n"
-"              localmente para que pueda consultarlo incluso cuando no esté\n"
-"              conectado a la red; los servidores <glossterm>IMAP</"
-"glossterm>\n"
-"              guardan el correo en el servidor para que puede acceder a el\n"
-"              desde varios sitios; los\n"
-"              archivos <systemitem><filename>mbox</filename></systemitem>\n"
-"              son usados por su ordenador para el correo interno, y pueden\n"
-"              ser útiles si quiere cambiar desde otro cliente de correo "
-"como\n"
-"              <application>Spruce</application> o\n"
-"              <application>Netscape Communicator</application>.  Pregunte\n"
-"              a su administrador de sistemas cual debe usar, o intente\n"
-"              hasta que alguno funcione.  Puede usar múltiples fuentes si "
-"lo\n"
-"              desea; vea <xref\n"
-"              linkend=\"config-prefs-mail-network\"> para más\n"
-"              información.\n"
-"            </para>\n"
-"            <para>\n"
-"              Si decide que <application>Evolution</application>\n"
-"              no use ningún servidor, los siguientes elementos no son\n"
-"              relevantes; tan solo debe indicar donde se encuentran los\n"
-"              archivos a los que desea acceder.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"\t  </varlistentry>\n"
-"          \n"
-"       <varlistentry>\n"
-"          <term> <guilabel>Servidor:</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"              Este debe ser el nombre del servidor de donde obtiene el\n"
-"              correo entrante.  Puede (o puede no) ser el mismo servidor\n"
-"              al que envía su correo saliente.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"\t</varlistentry>\n"
-"\n"
-"     <varlistentry>\n"
-"\t  <term><guilabel>Nombre de usuario:</guilabel></term>\n"
-"\t<listitem>\n"
-"            <para>\n"
-"             Introduzca el nombre de usuario de la cuenta de su servidor de\n"
-"             correo, si tiene una. En casi todos los casos, esta es la "
-"parte\n"
-"             de su correo de antes del carácter @, y\n"
-"             <application>Evolution</application> elige ese valor como\n"
-"             valor por defecto.  Si tiene un nombre de usuario distinto,\n"
-"             puede escribirlo aquí.\n"
-"           </para>\n"
-"\t  </listitem>\n"
-"      </varlistentry>\n"
-"     \n"
-"       <varlistentry>\n"
-"            <term><guilabel>Autentificación:</guilabel></term> \n"
-"\t    <listitem>\n"
-"\t    <para>\n"
-"              Selección el tipo de autentificación que usará.  "
-"Puede              pulsar <guibutton>Detectar tipos soportados</guibutton> "
-"para\n"
-"              averiguar que protocolos de autentificación admite su "
-"sistema.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"       </varlistentry>\n"
-"\n"
-"      <varlistentry> \n"
-"         <term><guilabel>Transporte de Correo:</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"              Este es el protocolo de envío de correo que quiera usar.\n"
-"              <application>Evolution</application> soporta ambos\n"
-"              <glossterm linkend=\"smtp\">SMTP</glossterm> y\n"
-"              <application>sendmail</application>; SMTP es de lejos el más\n"
-"              común.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"      </varlistentry>\n"
-"     </variablelist>\n"
-"      </para>\n"
-
-#: tmp/config-setupassist.sgml.h:150
-msgid ""
-"      <para>\n"
-"        The first time you try to send or receive mail with\n"
-"\t<application>Evolution</application>, the <interface>mail\n"
-"\tsetup assistant</interface> will pop up to help you with your\n"
-"\temail preferences.  If you don't plan to use email, or if\n"
-"\tyou'd rather deal with your email preferences later, click\n"
-"\t<guibutton>Cancel</guibutton>.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        La primera vez que intente enviar o recibir correo con\n"
-"\t<application>Evolution</application>, aparecerá el <interface>asistente "
-"de\n"
-"\tconfiguración del correo</interface> para ayudarle con la configuración "
-"de\n"
-"\tsu correo.  Si no piensa usar el correo electrónico, o si prefiere\n"
-"\tocuparse de la configuración de su correo más tarde, pulse\n"
-"\t<guibutton>Cancelar</guibutton>.\n"
-"      </para>\n"
-
-#: tmp/config-setupassist.sgml.h:159
-msgid ""
-"      <para>\n"
-"        The first time you try to use email, the mail setup assistant\n"
-"        will ask you for some basic information, so\n"
-"        <application>Evolution</application> can let you use email. If\n"
-"        you prefer more detailed configuration, or if you want to make\n"
-"        changes to an existing email setup, see <xref\n"
-"        linkend=\"config-prefs\">.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        La primera vez que intente usar el correo, el asistente de\n"
-"        configuración del correo le pedirá algunos datos básicos, para que\n"
-"        <application>Evolution</application> le deje usar el correo. Si\n"
-"        prefiere una configuración más detallada, o si quiere realizar\n"
-"        cambios en una configuración ya existente, vea <xref\n"
-"        linkend=\"config-prefs\">.\n"
-"      </para>\n"
-
-#: tmp/config-setupassist.sgml.h:168
-msgid ""
-"      <para>\n"
-"        To learn how to configure <application>Evolution</application>\n"
-"        in greater detail, or to change preferences once you have set\n"
-"        them, see <xref linkend=\"config-prefs\">.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        Para aprender a configurar <application>Evolution</application>\n"
-"        con todo detalle, o para cambiar las preferencias una vez que las\n"
-"        ha fijado, mire <xref linkend=\"config-prefs\">.\n"
-"      </para>\n"
-
-#: tmp/config-setupassist.sgml.h:174
-msgid "      <title>Easy Setup with the Setup Assistant</title>\n"
-msgstr "      <title>Configuración Fácil con el Asistente</title>\n"
-
-#: tmp/config-setupassist.sgml.h:176
-msgid "      <title>Mail Setup</title>\n"
-msgstr "      <title>Configuración del Correo</title>\n"
-
-#: tmp/config-setupassist.sgml.h:178
-msgid ""
-"<!--  \n"
-"\n"
-"        Before you get it, though, you should decide where you want to\n"
-"\tkeep it.  Your options will vary a little depending on your\n"
-"\tnetwork setup, but they come down to storing the mail on your\n"
-"\thard disk (using <glossterm linkend=\"pop\">POP</glossterm>), or\n"
-"\tstoring it on the network (using <glossterm\n"
-"\tlinkend=\"imap\">IMAP</glossterm>).  If you store your mail on\n"
-"\tyour local hard disk, you can read it whether you're online or\n"
-"\tnot, but you can only read it from one computer.  If you store\n"
-"\tit on the network, you can only read it when you're online,\n"
-"\tbut you can access it from almost any computer with a network\n"
-"\tconnection, even if it doesn't have\n"
-"\t<application>Evolution</application>.\n"
-"\n"
-"\n"
-"        If you choose POP, you'll be putting mail in the\n"
-"        <guilabel>Inbox</guilabel> in the <guilabel>Local</guilabel>\n"
-"        folder.  If you choose IMAP, it's the\n"
-"        <guilabel>Inbox</guilabel> of a folder with the same name as\n"
-"        your mail server.  That's so you can maintain several distinct\n"
-"        IMAP servers if you want.  See <xref\n"
-"        linkend=\"config-prefs-mail\"> for more information about mail\n"
-"        servers.\n"
-"-->\n"
-msgstr ""
-"<!--  \n"
-"\n"
-"        Antes de obtenerlo, eso si, debe decidir donde lo quiere conservar.\n"
-"\tSus opciones variarán ligeramente dependiendo de la configuración de su\n"
-"\tred, pero quedan simplificadas a guardar su correo en su disco duro\n"
-"\t(usando <glossterm linkend=\"pop\">POP</glossterm>), o guardarlo en\n"
-"\tla red (usando <glossterm linkend=\"imap\">IMAP</glossterm>).\n"
-"\tSi guarda el correo en su disco duro local, podrá leerlo tanto si\n"
-"\testá conectado o como si no, pero tan solo podrá leerlo desde un\n"
-"\tordenador.  Si lo guarda en la red, solo podrá leerlo cuando esté\n"
-"\tconectado, pero podrá leerlo desde casi cualquier ordenador con conexión\n"
-"\ta la red, incluso si no tiene\n"
-"\t<application>Evolution</application>.\n"
-"\n"
-"\n"
-"        Si elige POP, pondrá el correo en el\n"
-"        <guilabel>Inbox</guilabel> en la carpeta <guilabel>Local</"
-"guilabel>.\n"
-"        Si elige IMAP, es el\n"
-"        <guilabel>Inbox</guilabel> de una carpeta con el mismo nombre que "
-"su\n"
-"        servidor de correo.  Esto es así para que pueda tener varios\n"
-"        servidores IMAP distintos si quiere.  Vea <xref\n"
-"        linkend=\"config-prefs-mail\"> para más información acerca de los\n"
-"        servidores de correo.\n"
-"-->\n"
diff --git a/help/es.po/config-sync.sgml.po b/help/es.po/config-sync.sgml.po
deleted file mode 100644
index 42a1511eed..0000000000
--- a/help/es.po/config-sync.sgml.po
+++ /dev/null
@@ -1,264 +0,0 @@
-# Translation into Spanish of Evolution docs.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Héctor García Álvarez <hector@scouts-es.org>, 2000.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution-docs\n"
-"POT-Creation-Date: 2001-04-20 13:43+0200\n"
-"PO-Revision-Date: 2000-12-28 15:38+0100\n"
-"Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: tmp/config-sync.sgml.h:1
-msgid ""
-"      <para> \n"
-"         <warning> \n"
-"\t  <title>Data Loss Prevention</title> \n"
-"\t  <para>\n"
-"\t    It's always a good idea to make a backup.  To do that,\n"
-"\t    make a copy of your <systemitem>\n"
-"\t    <filename>~/evolution</filename> </systemitem> directory.\n"
-"          </para>\n"
-"\t</warning>\n"
-"       </para>\n"
-msgstr ""
-"      <para> \n"
-"         <warning> \n"
-"\t  <title>Prevención de Pérdida de Datos</title> \n"
-"\t  <para>\n"
-"\t    Siempre es una buena idea hacer una copia de seguridad.  Para "
-"hacerla,\n"
-"\t    haga una copia de su directorio\n"
-"\t    <systemitem><filename>~/evolution</filename></systemitem>.\n"
-"          </para>\n"
-"\t</warning>\n"
-"       </para>\n"
-
-#: tmp/config-sync.sgml.h:12
-msgid ""
-"     <para>\n"
-"        Once your computer and your Palm-OS device are talking happily\n"
-"        to each other, you'll have to decide what exactly you want\n"
-"        them to do with the data they exchange.  Your options may vary\n"
-"        depending on the conduit, but typically they will be:\n"
-"\n"
-"        <variablelist>\n"
-"         <varlistentry>\n"
-"            <term>Disabled </term>\n"
-"            <listitem> \n"
-"               <para>\n"
-"                  Do nothing.\n"
-"               </para>\n"
-"            </listitem>\n"
-"          </varlistentry>\n"
-"\n"
-"         <varlistentry>\n"
-"            <term>Synchronize</term>\n"
-"            <listitem> \n"
-"               <para>\n"
-"                  Copy new data from the computer to the handheld, and\n"
-"                  from the handheld to the computer.  Remove items\n"
-"                  that were on both systems but have been deleted on\n"
-"                  one.\n"
-"               </para>\n"
-"            </listitem>\n"
-"          </varlistentry>\n"
-"\n"
-"         <varlistentry>\n"
-"            <term>Copy From Pilot</term>\n"
-"            <listitem> \n"
-"               <para>\n"
-"                  If there is any new data on the the handheld device,\n"
-"                  copy it to the computer.\n"
-"               </para>\n"
-"            </listitem>\n"
-"          </varlistentry>\n"
-"\n"
-"         <varlistentry>\n"
-"            <term>Copy To Pilot</term>\n"
-"            <listitem> \n"
-"               <para>\n"
-"                 Copy new data from the computer to the handheld. \n"
-"               </para>\n"
-"            </listitem>\n"
-"          </varlistentry>\n"
-"\n"
-"         <varlistentry>\n"
-"            <term>Merge From Pilot</term>\n"
-"            <listitem> \n"
-"               <para>\n"
-"                  Copy new data from the handheld to the computer, and\n"
-"                  remove any information from the computer that has\n"
-"                  been deleted on the handheld.\n"
-"               </para>\n"
-"            </listitem>\n"
-"          </varlistentry>\n"
-"\n"
-"         <varlistentry>\n"
-"            <term>Merge To Pilot</term>\n"
-"            <listitem> \n"
-"               <para>\n"
-"                  Copy new data from the computer to the handheld, and\n"
-"                  remove any information from the handheld that has\n"
-"                  been deleted on the computer.\n"
-"               </para>\n"
-"            </listitem>\n"
-"          </varlistentry>\n"
-"       </variablelist>\n"
-"    </para>\n"
-msgstr ""
-"     <para>\n"
-"        Una vez que su ordenador y su dispositivo con Palm-OS se hablan el\n"
-"        uno al otro, debe decidir que quiere que hagan exactamente con los\n"
-"        datos que se intercambian.  Sus opciones pueden variar dependiendo\n"
-"        del enlaze, pero tipicamente serán:\n"
-"\n"
-"        <variablelist>\n"
-"         <varlistentry>\n"
-"            <term>Desactivar </term>\n"
-"            <listitem> \n"
-"               <para>\n"
-"                  No hace nada.\n"
-"               </para>\n"
-"            </listitem>\n"
-"          </varlistentry>\n"
-"\n"
-"         <varlistentry>\n"
-"            <term>Sincronizar</term>\n"
-"            <listitem> \n"
-"               <para>\n"
-"                  Copia los datos nuevos del ordenador al dispositivo de\n"
-"                  mano, y del dispositivo de mano al ordenador.  Elimina\n"
-"                  elementos que estaban en ambos sistemas pero han sido\n"
-"                  borrados en uno de ellos.\n"
-"               </para>\n"
-"            </listitem>\n"
-"          </varlistentry>\n"
-"\n"
-"         <varlistentry>\n"
-"            <term>Copiar desde Pilot</term>\n"
-"            <listitem> \n"
-"               <para>\n"
-"                  Si hay datos nuevos en el dispositivo de mano, los copia\n"
-"                  al ordenador.\n"
-"               </para>\n"
-"            </listitem>\n"
-"          </varlistentry>\n"
-"\n"
-"         <varlistentry>\n"
-"            <term>Copiar a Pilot</term>\n"
-"            <listitem> \n"
-"               <para>\n"
-"                 Copia datos nuevos del ordenador al dispositivo de mano. \n"
-"               </para>\n"
-"            </listitem>\n"
-"          </varlistentry>\n"
-"\n"
-"         <varlistentry>\n"
-"            <term>Sincronizar desde Pilot</term>\n"
-"            <listitem> \n"
-"               <para>\n"
-"                  Copia los datos nuevos del dispositivo de mano al\n"
-"                  ordenador, y elimina cualquier información del ordenador\n"
-"                  que haya sido borrada del dispositivo de mano.\n"
-"               </para>\n"
-"            </listitem>\n"
-"          </varlistentry>\n"
-"\n"
-"         <varlistentry>\n"
-"            <term>Sincronizar en el Pilot</term>\n"
-"            <listitem> \n"
-"               <para>\n"
-"                  Copia los datos nuevos del ordenador al dispositivo de\n"
-"                  mano, y elimina cualquier información del dispositivo\n"
-"                  de mano que haya sido borrada del ordenador.\n"
-"               </para>\n"
-"            </listitem>\n"
-"          </varlistentry>\n"
-"       </variablelist>\n"
-"    </para>\n"
-
-#: tmp/config-sync.sgml.h:83
-msgid ""
-"     <para>\n"
-"        Synchronization presents you with two issues you'll need to\n"
-"        deal with. \n"
-"        <simplelist>\n"
-"          <member>\n"
-"            Your computer needs to recognize and access your handheld.\n"
-"            At this time, <application>Evolution</application> only\n"
-"            supports Palm-OS devices like the PalmPilot and the\n"
-"            Handspring Visor.\n"
-"          </member>\n"
-"          <member>\n"
-"           You should decide what sort of synchronization behavior you\n"
-"           want.\n"
-"          </member>\n"
-"        </simplelist>\n"
-"\n"
-"    </para>\n"
-msgstr ""
-"     <para>\n"
-"        La sincronización le presenta dos temas de los que se tendrá que\n"
-"        ocupar. \n"
-"        <simplelist>\n"
-"          <member>\n"
-"            Su ordenador deberá reconocer y acceder a su dispositivo de\n"
-"            mano. En este momento, <application>Evolution</application> "
-"solo\n"
-"            soporta dispositivos con Palm-OS como el PalmPilot y el\n"
-"            Handspring Visor.\n"
-"          </member>\n"
-"          <member>\n"
-"           Debe decidir que estilo de sincronización quiere.\n"
-"          </member>\n"
-"        </simplelist>\n"
-"\n"
-"    </para>\n"
-
-#: tmp/config-sync.sgml.h:101
-msgid "     <title>Setting up your synchronization system</title> \n"
-msgstr "     <title>Configurando su sistema de sincronización</title> \n"
-
-#: tmp/config-sync.sgml.h:103
-msgid ""
-"    <para>\n"
-"       If you haven't used a handheld device with your computer\n"
-"       before, you'll need to run the GNOME <application>Control\n"
-"       Center</application> and make sure that <application>Pilot\n"
-"       Link</application> is properly configured. Then, select the\n"
-"       <application>Evolution</application> <glossterm\n"
-"       linkend=\"conduit\">conduits</glossterm> under the\n"
-"       <guilabel>Pilot Conduits</guilabel> section of the Control\n"
-"       Center.\n"
-"      </para>\n"
-msgstr ""
-"    <para>\n"
-"       Si no ha usado antes un dispositivo de mano con su ordenador, debe\n"
-"       ejecutar el <application>Centro de Control</application> de GNOME\n"
-"       y asegurarse que <application>Enlaze con Pilot</application> está\n"
-"       configurado apropiadamente. Entonces, seleccione el <glossterm\n"
-"       linkend=\"conduit\">enlaze</glossterm> de\n"
-"       <application>Evolution</application> bajo la sección\n"
-"       <guilabel>Enlazes de Pilot</guilabel> del Centro de Control.\n"
-"      </para>\n"
-
-#: tmp/config-sync.sgml.h:114
-msgid ""
-"    <para>\n"
-"      Select a behavior for each conduit available.  For the most\n"
-"      part, you'll want to stick with\n"
-"      <guilabel>Synchronize</guilabel>.  Then, put your handheld on\n"
-"      its cradle and press the synchronization button.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"      Seleccione un comportamiento para cada enlaze disponible.  Para la\n"
-"      mayoría, querra quedarse con <guilabel>Sincronizar</guilabel>.\n"
-"      Entoces, ponga el dispositivo de mano en su cuna y presione el\n"
-"      botón de sincronización.\n"
-"    </para>\n"
diff --git a/help/es.po/evolution.sgml.po b/help/es.po/evolution.sgml.po
deleted file mode 100644
index 5bc1f0a268..0000000000
--- a/help/es.po/evolution.sgml.po
+++ /dev/null
@@ -1,165 +0,0 @@
-# Translation into Spanish of Evolution docs.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Héctor García Álvarez <hector@scouts-es.org>, 2000.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution-docs\n"
-"POT-Creation-Date: 2001-04-20 13:43+0200\n"
-"PO-Revision-Date: 2000-12-28 15:38+0100\n"
-"Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: tmp/evolution.sgml.h:1
-msgid ""
-"       <para>\n"
-"         Many of the names used by companies to distinguish their\n"
-"         products and services are claimed as trademarks. Where those\n"
-"         names appear in any GNOME documentation, and those trademarks\n"
-"         are made aware to the members of the GNOME Documentation\n"
-"         Project, the names have been printed in caps or initial caps.\n"
-"       </para>\n"
-msgstr ""
-"       <para>\n"
-"         Muchos de los nombres que usan las compañías para distinguir sus\n"
-"         productos y servicios están registrados como marcas.  Cuando\n"
-"         aparecen esos nombres en la documentación de GNOME, y el Proyecto\n"
-"         de Documentación de GNOME tiene conocimiento de dichas marcas,\n"
-"         estos han sido escritos en mayúsculas o empiezan con mayúsculas.\n"
-"       </para>\n"
-
-#: tmp/evolution.sgml.h:9
-msgid ""
-"      <para>\n"
-"        <application>Evolution</application> is highly configurable.\n"
-"        Usually, when developers say that, they mean that they didn't\n"
-"        test it out thoroughly and have left it to other programmers\n"
-"        to \"configure\" themselves a working system. In the case of\n"
-"        <application>Evolution</application>, \"configurable\" means\n"
-"        what it ought to.  It means that, while you can expect the\n"
-"        program to work perfectly well in its default settings, it's\n"
-"        also easy to alter its behavior in a wide variety of ways, so\n"
-"        that it fits your needs exactly.  This part of the book will\n"
-"        describe that process, from the quickest glimpse of the Setup\n"
-"        Assistant to an in-depth tour of the preferences dialogs.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        <application>Evolution</application> es altamente configurable.\n"
-"        Normalmente, cuando los desarrolladores dicen esto, significa que\n"
-"        no lo han probado a fondo y que dejan a otros programadores que se\n"
-"        \"configuren\" ellos mismos un sistema que funcione. En el caso de\n"
-"        <application>Evolution</application>, \"configurable\" significa\n"
-"        lo que debe.  Significa que, aunque puede esperar que el programa\n"
-"        funcione perfectamente bien con sus opciones por defecto, además\n"
-"        es sencillo alterar su comportamiento entre una amplia gama, para\n"
-"        que encaje exactamente con sus necesidades.  Esta parte del libro\n"
-"        describirá ese proceso, desde la vista superficial del Asistente\n"
-"        de Configuración hasta una visión a fondo de los diálogos de\n"
-"        preferencias.\n"
-"      </para>\n"
-
-#: tmp/evolution.sgml.h:23
-msgid ""
-"      <para>\n"
-"        Part one of the <application>Evolution</application> manual\n"
-"        describes how to use <application>Evolution</application> for\n"
-"        email, contact management, and appointment and task\n"
-"        scheduling.  You'll find as you go along that there's more\n"
-"        than one way to do things, and you can pick whichever method\n"
-"        you like best.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        La primera parte del manual de\n"
-"        <application>Evolution</application> describe como usar\n"
-"        <application>Evolution</application> para el correo, el\n"
-"        administrador de contactos y como fijar citas y tareas.\n"
-"        Según vaya utilizando estas cosas descubrirá que hay más de\n"
-"        una manera de hacer las cosas, y puede puede elegir el método\n"
-"        que más le guste.\n"
-"      </para>\n"
-
-#: tmp/evolution.sgml.h:32
-msgid ""
-"      <para>\n"
-"        The following reference covers all, or nearly all, of the\n"
-"        menus and menu commands that\n"
-"        <application>Evolution</application> has to offer you.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        La siguiente referencia cubre todos, o casi todos, los menús y los\n"
-"        comandos de los menús que le ofrece\n"
-"        <application>Evolution</application>.\n"
-"      </para>\n"
-
-#: tmp/evolution.sgml.h:38
-msgid ""
-"     <para>\n"
-"         Permission is granted to copy, distribute and/or modify this\n"
-"         document under the terms of the <ulink type=\"help\"\n"
-"         url=\"gnome-help:fdl\"><citetitle>GNU Free Documentation\n"
-"         License</citetitle></ulink>, Version 1.1 or any later version\n"
-"         published by the Free Software Foundation with no Invariant\n"
-"         Sections, no Front-Cover Texts, and no Back-Cover Texts. You\n"
-"         may obtain a copy of the <citetitle>GNU Free Documentation\n"
-"         License</citetitle> from the Free Software Foundation by\n"
-"         visiting <ulink type=\"http\" url=\"http://www.fsf.org\">their\n"
-"         Web site</ulink> or by writing to: Free Software Foundation,\n"
-"         Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
-"         USA.\n"
-"       </para>\n"
-msgstr ""
-"     <para>\n"
-"         Se garantiza permiso para copiar, distribuir y/o modificar este\n"
-"         documento bajo los términos de la <ulink type=\"help\"\n"
-"         url=\"gnome-help:fdl\"><citetitle>Licencia de Documentación Libre\n"
-"         de GNU</citetitle></ulink>, Versión 1.1 o posteriores versiones\n"
-"         publicadas por la Fundación para el Software Libre (Free Software\n"
-"         Foundation) sin Secciones Invariantes, sin Textos de Portada y sin\n"
-"         Textos de Contraportada. Puede obtener una copia de la\n"
-"         <citetitle>Licencia de Documentación Libre de GNU</"
-"citetitle>n         de la Fundación para el Software Libre visitando su\n"
-"         <ulink type=\"http\" url=\"http://www.fsf.org\">sitio Web</ulink>\n"
-"         o escribiendo a: Free Software Foundation,\n"
-"         Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n"
-"         USA.\n"
-"       </para>\n"
-
-#: tmp/evolution.sgml.h:53
-msgid "    <title>A User's Guide to Evolution</title>\n"
-msgstr "    <title>Una guía para el usuario de Evolution</title>\n"
-
-#: tmp/evolution.sgml.h:55
-msgid "    <title>Comprehensive Menu reference</title>\n"
-msgstr "    <title>Referencia extensa de los Menus</title>\n"
-
-#: tmp/evolution.sgml.h:57
-msgid "    <title>Using Evolution</title>\n"
-msgstr "    <title>Usando Evolution</title>\n"
-
-#: tmp/evolution.sgml.h:59
-msgid "  <title>Configuring and Managing Evolution</title>\n"
-msgstr "  <title>Configurando y administrando Evolution</title>\n"
-
-#: tmp/evolution.sgml.h:61
-msgid "<!--   &USAGE-NOTES; -->\n"
-msgstr "<!--   &USAGE-NOTES; -->\n"
-
-#: tmp/evolution.sgml.h:63
-msgid ""
-"<!-- Almost every chapter is an entity.  Files, Chapter id's, and\n"
-"entity names correspond.  APX is for appendix. Note that there is no\n"
-"entity for apx-notes.sgml, which is still included in the file\n"
-"set. Reinstate the entity if and when the Notes feature is\n"
-"implemented. -->\n"
-msgstr ""
-"<!-- Almost every chapter is an entity.  Files, Chapter id's, and\n"
-"entity names correspond.  APX is for appendix. Note that there is no\n"
-"entity for apx-notes.sgml, which is still included in the file\n"
-"set. Reinstate the entity if and when the Notes feature is\n"
-"implemented. -->\n"
diff --git a/help/es.po/menuref.sgml.po b/help/es.po/menuref.sgml.po
deleted file mode 100644
index f9d68a84ab..0000000000
--- a/help/es.po/menuref.sgml.po
+++ /dev/null
@@ -1,3062 +0,0 @@
-# Translation into Spanish of Evolution docs.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Héctor García Álvarez <hector@scouts-es.org>, 2000.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution-docs\n"
-"POT-Creation-Date: 2001-04-20 13:43+0200\n"
-"PO-Revision-Date: 2000-12-28 15:38+0100\n"
-"Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: tmp/menuref.sgml.h:1
-msgid ""
-"      <para>\n"
-"\t<variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guisubmenu>New...</guisubmenu> Submenu</term>\n"
-"\t    <listitem><para>\n"
-"\t\t<itemizedlist>\n"
-"\t\t  <listitem><para>\n"
-"\t\t      <guimenuitem>Folder</guimenuitem> &mdash;\n"
-"\t\t       Create a new folder. See <xref \n"
-"\t\t       linkend=\"usage-mainwindow-folderbar\">\n"
-"\t\t       for more information about folders.\n"
-"\t\t    </para></listitem>\n"
-"\t\t  <listitem><para>\n"
-"\t\t      <guimenuitem>Shortcut</guimenuitem> &mdash;\n"
-"\t\t       Create a new Shortcut in the Shortcut Bar.\n"
-"\t\t    </para></listitem>\n"
-"\t\t  <listitem><para>\n"
-"\t\t      <guimenuitem>Mail Message</guimenuitem> &mdash;\n"
-"\t\t       Compose a new mail message. Covered in\n"
-"\t\t       <xref linkend=\"usage-mail-getnsend-send\">.\n"
-"\t\t    </para></listitem>\n"
-"\t\t  <listitem><para>\n"
-"\t\t      <guimenuitem>Appointment</guimenuitem> &mdash;\n"
-"\t\t       Enter a new appointment in your calendar. See <xref\n"
-"\t\t\tlinkend=\"usage-calendar-apts-basic\"> for more information.\n"
-"\t\t    </para></listitem>\n"
-"\t\t  <listitem><para>\n"
-"\t\t      <guimenuitem>Task</guimenuitem> &mdash;\n"
-"\t\t       Enter a new to-do item in your taskpad. Covered in \n"
-"\t\t       <xref linkend=\"usage-calendar-todo\">.\n"
-"\t\t    </para></listitem>\n"
-"\t\t</itemizedlist>\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Go to Folder</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"               View the items in a particular folder.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Create New Folder</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t\t This item doesn't belong here any more.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t  \n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Print Message</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t\t Print the current message.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t  \n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Exit</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t\t Quit using <application>Evolution</application>.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"       </para>\n"
-msgstr ""
-"      <para>\n"
-"\t<variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guisubmenu>Nuevo...</guisubmenu> Submenu</term>\n"
-"\t    <listitem><para>\n"
-"\t\t<itemizedlist>\n"
-"\t\t  <listitem><para>\n"
-"\t\t      <guimenuitem>Carpeta</guimenuitem> &mdash;\n"
-"\t\t       Crear una nueva carpeta. Vea <xref \n"
-"\t\t       linkend=\"usage-mainwindow-folderbar\">\n"
-"\t\t       para más información acerca de las carpetas.\n"
-"\t\t    </para></listitem>\n"
-"\t\t  <listitem><para>\n"
-"\t\t      <guimenuitem>Atajo</guimenuitem> &mdash;\n"
-"\t\t       Crear un nuevo Atajo en la Barra de Atajos.\n"
-"\t\t    </para></listitem>\n"
-"\t\t  <listitem><para>\n"
-"\t\t      <guimenuitem>Mensaje de Correo</guimenuitem> &mdash;\n"
-"\t\t       Escribir un nuevo mensaje de correo. Cubierto en\n"
-"\t\t       <xref linkend=\"usage-mail-getnsend-send\">.\n"
-"\t\t    </para></listitem>\n"
-"\t\t  <listitem><para>\n"
-"\t\t      <guimenuitem>Cita</guimenuitem> &mdash;\n"
-"\t\t       Concertar una nueva cita en su calendario. Vea <xref\n"
-"\t\t\tlinkend=\"usage-calendar-apts-basic\"> para más información.\n"
-"\t\t    </para></listitem>\n"
-"\t\t  <listitem><para>\n"
-"\t\t      <guimenuitem>Tarea</guimenuitem> &mdash;\n"
-"\t\t       Escriba un nuevo elemento para-hacer en su lista de tareas.\n"
-"\t\t       Cubierto en \n"
-"\t\t       <xref linkend=\"usage-calendar-todo\">.\n"
-"\t\t    </para></listitem>\n"
-"\t\t</itemizedlist>\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Ir a Carpeta</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"               Ver los elementos de una carpeta en particular.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Crear Nueva Carpeta</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t\t Este elemento ya no pertenece aquí.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t  \n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Imprimir Mensaje</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t\t Imprime el mensaje actual.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t  \n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Salir</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t\t Parar de usar <application>Evolution</application>.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"       </para>\n"
-
-#: tmp/menuref.sgml.h:67
-msgid ""
-"      <para>\n"
-"          <variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Sort Ascending</guimenuitem></term>\n"
-"\t      <listitem><para>\n"
-"\t\t Sort the list, in ascending order, by the attribute you clicked.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Sort Descending</guimenuitem></term>\n"
-"\t      <listitem><para>\n"
-"\t\t Sort the list in descending order.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"  \n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Unsort</guimenuitem></term>\n"
-"\t      <listitem><para>\n"
-"\t\t Undo any sorting by this attribute, and leave the message list sorted \n"
-"                 by the previous one.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Group by this Field</guimenuitem></term>\n"
-"\t      <listitem><para>\n"
-"\t\t Instead of sorting the messages, group them in boxes. \n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Group by Box</guimenuitem></term>\n"
-"\t      <listitem><para> If you have your messages grouped in\n"
-"\t      boxes, you can arrange the boxes as well, by choosing\n"
-"\t      this item.  </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Remove this column</guimenuitem></term>\n"
-"\t      <listitem><para>\n"
-"\t\t Choose this to remove the column from the message list display.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Field Chooser</guimenuitem></term>\n"
-"\t      <listitem><para>\n"
-"\t\t Opens a palette of columns. You can drag the columns\n"
-"\t\t you want from the palette into position in the\n"
-"\t\t message list heading bar; red arrows appear\n"
-"\t\t when you get close enough to a possibile position.</para>\n"
-"                 \n"
-"              <para>\n"
-"                 Your options are: \n"
-"                 <itemizedlist>\n"
-"                     <listitem><para>\n"
-"                         <guiicon>An Envelope</guiicon> which indicates "
-"whether a message has been read (closed for unread, open for read).\n"
-"                     </para></listitem>\n"
-"\n"
-"                     <listitem><para>\n"
-"                         <guiicon>An Exclamation Point</guiicon> for "
-"priority\n"
-"                     </para></listitem>\n"
-"\n"
-"                     <listitem><para>\n"
-"                         <guiicon>A Penguin</guiicon> which indicates "
-"something, although I'm not sure what.\n"
-"                     </para></listitem>\n"
-"\n"
-"                     <listitem><para>\n"
-"                         <guiicon>A Paper Clip</guiicon> which indicates "
-"that there is an attachment to the message.\n"
-"                     </para></listitem>\n"
-"\n"
-"                     <listitem><para>\n"
-"                         <guilabel>From</guilabel>, for the <guilabel>From</"
-"guilabel> field of a message.\n"
-"                     </para></listitem>\n"
-"                     <listitem><para>\n"
-"                         <guilabel>Subject</guilabel>, for the "
-"<guilabel>Subject</guilabel> field of a message.\n"
-"                     </para></listitem>\n"
-"\n"
-"                     <listitem><para>\n"
-"                         <guilabel>Date</guilabel>, for the date and time a "
-"message was sent.\n"
-"                     </para></listitem>\n"
-"\n"
-"                     <listitem><para>\n"
-"                         <guilabel>Received</guilabel>, for the date and "
-"time you got the message. \n"
-"                     </para></listitem>\n"
-"\n"
-"                     <listitem><para>\n"
-"                         <guilabel>To</guilabel>, for the <guilabel>To</"
-"guilabel> field.\n"
-"                     </para></listitem>\n"
-"\n"
-"                     <listitem><para>\n"
-"                         <guilabel>Size</guilabel>, for a message's size.\n"
-"                     </para></listitem>\n"
-"\t\t  </itemizedlist>\n"
-"             </para>   \n"
-"\n"
-"\t      </listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Alignment</guimenuitem></term>\n"
-"\t      <listitem><para> Use this item to decide upon the\n"
-"\t      alignment of the message attributes within their\n"
-"\t      columns.  </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Best Fit</guimenuitem></term>\n"
-"\t      <listitem><para>\n"
-"\t\t Alters the width of the message list columns to maximize the amount of "
-"information displayed.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Format Columns...</guimenuitem></term>\n"
-"\t      <listitem><para>\n"
-"\t\t This item is not yet available.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Customize\n"
-"\t      Views...</guimenuitem></term> <listitem><para> Opens a\n"
-"\t      dialog box that lets you choose a complex set of\n"
-"\t      arrangements for your message list, so you can combine\n"
-"\t      sorting and grouping in as many ways as you like.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"          </variablelist>\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"          <variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Ordenar Ascendentemente</guimenuitem></term>\n"
-"\t      <listitem><para>\n"
-"\t\t Ordenar la lista, en orden ascendente, según el atributo sobre el que\n"
-"                 pulsó.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Ordenar Descendentemente</guimenuitem></term>\n"
-"\t      <listitem><para>\n"
-"\t\t Ordenar la lista en orden descendente.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"  \n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Desordenar</guimenuitem></term>\n"
-"\t      <listitem><para>\n"
-"\t\t Deshacer cualquier ordenación mediante este atributo, y dejar la lista\n"
-"                 según el orden anterior.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Agrupar según este Campo</guimenuitem></term>\n"
-"\t      <listitem><para>\n"
-"\t\t En lugar de ordenar los mensajes, los agrupa en cajas. \n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Agrupar por Caja</guimenuitem></term>\n"
-"\t      <listitem><para> Si tiene los mensajes agrupados en cajas,\n"
-"\t      puede agrupar del mismo modo las cajas, eligiendo este\n"
-"\t      elemento.  </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Quitar esta columna</guimenuitem></term>\n"
-"\t      <listitem><para>\n"
-"\t\t Elija esto para quitar una columna de la vista de la lista de "
-"mensajes.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Selector de Campos</guimenuitem></term>\n"
-"\t      <listitem><para>\n"
-"\t\t Abre una paleta de columnas. Usted puede arrastra las columnas\n"
-"\t\t que quiera desde la paleta hasta la posición en la barra de cabecera\n"
-"\t\t de la lista de mensajes; aparecen flechas rojas cunado se acerca los\n"
-"\t\t suficiente a una posición posible.</para>\n"
-"                 \n"
-"              <para>\n"
-"                 Sus opciones son: \n"
-"                 <itemizedlist>\n"
-"                     <listitem><para>\n"
-"                         <guiicon>Un Sobre</guiicon> el cual indica cuando "
-"un mensaje a sido leído (cerrado para no leído, abierto para leído).\n"
-"                     </para></listitem>\n"
-"\n"
-"                     <listitem><para>\n"
-"                         <guiicon>Un Signo de Exclamación</guiicon> para la "
-"prioridad\n"
-"                     </para></listitem>\n"
-"\n"
-"                     <listitem><para>\n"
-"                         <guiicon>Un Pingüino</guiicon> el cual indica algo, "
-"aunque no estoy seguro de que.\n"
-"                     </para></listitem>\n"
-"\n"
-"                     <listitem><para>\n"
-"                         <guiicon>Un Clip</guiicon> el cual indica que hay "
-"un adjunto en el mensaje.\n"
-"                     </para></listitem>\n"
-"\n"
-"                     <listitem><para>\n"
-"                         <guilabel>De</guilabel>, para el campo "
-"<guilabel>De</guilabel> del mensaje.\n"
-"                     </para></listitem>\n"
-"                     <listitem><para>\n"
-"                         <guilabel>Asunto</guilabel>, para el campo "
-"<guilabel>Asunto</guilabel> del mensaje.\n"
-"                     </para></listitem>\n"
-"\n"
-"                     <listitem><para>\n"
-"                         <guilabel>Fecha</guilabel>, para la fecha y la hora "
-"en que se mandó el mensaje.\n"
-"                     </para></listitem>\n"
-"\n"
-"                     <listitem><para>\n"
-"                         <guilabel>Recibido</guilabel>, para la fecha y la "
-"hora en la que recibió en mensaje. \n"
-"                     </para></listitem>\n"
-"\n"
-"                     <listitem><para>\n"
-"                         <guilabel>A</guilabel>, para el campo <guilabel>A</"
-"guilabel>.\n"
-"                     </para></listitem>\n"
-"\n"
-"                     <listitem><para>\n"
-"                         <guilabel>Tamaño</guilabel>, para el tamaño del "
-"mensaje.\n"
-"                     </para></listitem>\n"
-"\t\t  </itemizedlist>\n"
-"             </para>   \n"
-"\n"
-"\t      </listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Alineación</guimenuitem></term>\n"
-"\t      <listitem><para> Use este elemento para decidir sobre la alineación\n"
-"\t      de los atributos de los mensajes en sus columnas.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Mejor Colocación</guimenuitem></term>\n"
-"\t      <listitem><para>\n"
-"\t\t Modifica el ancho de las columnas de la lista de mensajes para\n"
-"maximizar la cantidad de información mostrada.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Formato de las Columnas...</guimenuitem></term>\n"
-"\t      <listitem><para>\n"
-"\t\t Este elemento no está disponible todavía.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenuitem>Personalizar\n"
-"\t      Vistas...</guimenuitem></term> <listitem><para> Abre una\n"
-"\t      caja de diálogo que le permite elegir una ordenación compleja para\n"
-"\t      su lista de mensajes, así puede combinar ordenar y agrupar de "
-"tantas\n"
-"\t      maneras como quiera.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"          </variablelist>\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:202
-msgid ""
-"      <para>\n"
-"          <variablelist>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Open in New Window</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Displays the selected message in a new window.\n"
-"\t   </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Edit Message</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t      Open the selected message in the message composer.  You\n"
-"              can only edit a message you have written: drafts and messages "
-"in \n"
-"              the <guilabel>Sent</guilabel> box. \n"
-"\t   </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Print Message</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Displays the <interface>Print Preview</interface> window, \n"
-"               ready for printing.\n"
-"\t   </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Reply to Sender</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Opens a message composition window addressed to the\n"
-"               author of the  message.  Covered in detail in \n"
-"               <xref linkend=\"usage-mail-getnsend-send-reply\">.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Reply to All</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t        Opens a message composition window addressed to the\n"
-"                author of the  message and all known recipients.\n"
-"                Covered in detail in <xref linkend=\"usage-mail-getnsend-"
-"send-reply\">.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Forward</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Appends the body of the selected message to a new message.\n"
-"               Covered in detail in  <xref linkend=\"usage-mail-getnsend-fwd"
-"\">.               \n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Delete Message</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Marks a message for deletion.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Move Message</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Choose a folder in which to place this message.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Copy Message</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Copy the selected  message to another folder.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>VFolder on Subject</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       This item, and the three that follow it, will create vFolders \n"
-"               which you may customize further or save as-is. This one will\n"
-"               create a vFolder which will display all messages that contain "
-"the \n"
-"               subject line of the selected message.                \n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>VFolder on Sender</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Creates a vFolder to hold all messages from the sender of\n"
-"               the selected message.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>VFolder on Recipients</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Creates a VFolder to hold all messages addressed to the \n"
-"               recipient of the selected message.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Filter on Subject</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       This item, and the three that follow it, will create Filters \n"
-"               for which you must select actions.  You may keep the criteria "
-"as \n"
-"               they are, or alter them as you wish. This one will\n"
-"               create a filter which will affect all messages that contain "
-"the \n"
-"               subject line of the selected message.                \n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Filter on Sender</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Creates a filter which affects all messages from the sender of\n"
-"               the selected message.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Filter on Recipients</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Creates a filter which will affect all messages addressed to the \n"
-"               recipient of the selected message.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t</variablelist>\n"
-"       </para>\n"
-msgstr ""
-"      <para>\n"
-"          <variablelist>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Abrir en una Nueva Ventana</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Muestra el mensaje seleccionado en una nueva ventana.\n"
-"\t   </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Editar Mensaje</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t      Abre el mensaje seleccionado en el compositor de mensajes.  Solo\n"
-"              puede editar mensajes que haya escrito usted: drafts y "
-"mensajes en \n"
-"              la carpeta <guilabel>Enviados</guilabel>.\n"
-"\t   </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Imprimir Mensaje</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Muestra la ventana de <interface>Vista Previa</interface>, \n"
-"               lista para imprimir.\n"
-"\t   </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Responder al Remitente</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Abre una ventana con el compositor de mensajes con la dirección\n"
-"               puesta al autor del mensaje.  Cubierto en detalle en \n"
-"               <xref linkend=\"usage-mail-getnsend-send-reply\">.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Responder a Todos</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Abre una ventana con el compositor de mensajes con la dirección\n"
-"      puesta al autor del mensaje y a todos los destinatarios conocidos.\n"
-"                Cubierto en detalle en <xref linkend=\"usage-mail-getnsend-"
-"send-reply\">.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Reenviar</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Adjunta el cuerpo del mensaje seleccionado a un nuevo mensaje.\n"
-"               Cubierto en detalle en  <xref linkend=\"usage-mail-getnsend-"
-"fwd\">.               \n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Borrar Mensaje</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Marca un mensaje para borrar.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Mover Mensaje</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Elije una carpeta a la cual enviar este mensaje.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Copiar Mensaje</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Copia el mensaje seleccionado a otra carpeta.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>VFolder según el Asunto</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Este elemento, y los tres que le siguen, crearán carpetas  \n"
-"  virtuales que podrá personalizar más o guardar tal cual. Este creará una\n"
-"              carpeta virtual que mostrará todos los mensajes que contengan "
-"la \n"
-"               línea del asunto del mensaje seleccionado.                \n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>VFolder según el Remitente</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Crea una carpeta virtual para poner en ella todos los mensajes del\n"
-"                 remitente del mensaje seleccionado.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>VFolder según Destinatarios</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Crea una carpeta virtaul para poner en ella todos enviados a los \n"
-"               destinatarios del mensaje seleccionado.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Filtro según el Asunto</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Este elemento, y los tres siguientes, crearán filtros para los "
-"que \n"
-"               debe elegir una acción.  Puede conservar el criterio como \n"
-"               está, o modificarla como quiera. Este creará un filtro que\n"
-"               afectará a todos los mensajes que contengan la línea del \n"
-"               asunto del mensaje seleccionado.                \n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Filtrar según Remitente</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Crea un filtro que afectará a todos los mensajes del remitente del\n"
-"               mensaje seleccionado.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Filtrar según Destinatarios</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Crea un filtro que afectará a todos los mensajes dirigidos a los \n"
-"               destinatarios del mensaje seleccionado.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t</variablelist>\n"
-"       </para>\n"
-
-#: tmp/menuref.sgml.h:334
-msgid ""
-"      <para>\n"
-"          The <guimenu>Edit</guimenu> menu in the message composer\n"
-"          contains the following items.  Keyboard shortcuts are listed\n"
-"          next to the items in the menus themselves.\n"
-"\n"
-"        <variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Undo</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"                Undoes the last action you performed.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"    \t  <varlistentry>\n"
-"\t    <term><guimenuitem>Redo</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"               If you change your mind about Undoing something, \n"
-"               you can always use this item.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Cut</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"                Removes the selected text from the text entry window and \n"
-"                retains it in the system \"clipboard\" memory, ready for "
-"pasting.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Copy</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Copies selected text to the system clipboard without deleting "
-"it.\n"
-"              The text can then be inserted elsewhere with the \n"
-"              <guimenuitem>Paste</guimenuitem> command.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Paste</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"                Inserts the contents of the system clipboard at the \n"
-"                location of the cursor.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Find</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"               Enter a phrase and find your match in your message body.\n"
-"               As with <guimenuitem>Find Regex</guimenuitem>, \n"
-"               <guimenuitem>Find Again</guimenuitem>, and\n"
-"               <guimenuitem>Replace</guimenuitem>, <application>Evolution</"
-"application>\n"
-"                will offer you the option to search forwards or backwards.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Find Regex</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"               If you are familiar with <glossterm>regular expressions</"
-"glossterm>,\n"
-"                often called \"regexes,\" you can search for something more "
-"complicated, \n"
-"               using wildcards and boolean logic.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Find Again</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Repeats your last search.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Replace</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"               Enter a word or phrase and the word or phrase with which "
-"you'd like\n"
-"               to replace it.  \n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Properties</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"               This item brings up the Message Composer Properties "
-"Capplet, \n"
-"               a portion of the GNOME Control Center that determines the \n"
-"               key bindings for the message composer.  Help for this capplet "
-"is \n"
-"               available directly from the Control Center.\n"
-"               (FIXME: Write that help doc too) (FIXME: this is in the wrong "
-"place!)\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t</variablelist>\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"          El menú <guimenu>Editar</guimenu> en el compositor de mensajes\n"
-"          contiene los siguientes elementos.  Los atajos de teclado están\n"
-"          al lado de los elementos en los propios menús.\n"
-"\n"
-"        <variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Deshacer</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"                Deshace la última acción realizada.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"    \t  <varlistentry>\n"
-"\t    <term><guimenuitem>Rehacer</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"               Si cambia de idea sobre Deshacer algo, \n"
-"               siempre puede usar esta opción.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Cotar</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"                Elimina el texto seleccionado de la ventana de edición y "
-"lo \n"
-"                guarda en la memoria del \"portapapeles\" del sistema, listo "
-"para pegarlo.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Copia</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Copia el texto seleccionado al portapapeles del sistema sin "
-"borrarlo.\n"
-"              Entoces el texto puede ser insertado en otra parte con el \n"
-"              comando <guimenuitem>Pegar</guimenuitem>.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Pegar</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"                Inserta el contenido del portapapeles del sistema en la \n"
-"                posición del cursor.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Buscar</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"               Escriba una frase y encuantra las coincidencias en el "
-"cuerpo \n"
-"               del mensaje. Como con \n"
-"               <guimenuitem>Buscar Expresión</guimenuitem>, \n"
-"               <guimenuitem>Buscar de nuevo</guimenuitem>, y\n"
-"               <guimenuitem>Remplazar</guimenuitem>, <application>Evolution</"
-"application>\n"
-"               le ofrecerá la opción de buscar hacia adelante o hacia "
-"atras.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Buscar Expresión</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"               Si esta familiarizado con las <glossterm>expresiones "
-"regulares</glossterm>,\n"
-"                ha veces llamadas \"regexes\", puede buscar cosas más "
-"complicadas, \n"
-"               usando comodines y lógica booleana.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Buscar de nuevo</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Repite la última búsqueda.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Remplazar</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"               Escriba una palabra o frase y la palabra o frase por la que "
-"le gustaría\n"
-"               reemplazarla.  \n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Propiedades</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"               Esta opción muestra el Capplet de Propiedades del Compositor "
-"de Mensajes,\n"
-"               una parte del Centro de Control de GNOME ue determina la \n"
-"               asociación de teclas en el compositor de mensajes.  La ayuda "
-"para este capplet está \n"
-"               disponible directamente en el Centro de Control.\n"
-"               (FIXME: Write that help doc too) (FIXME: this is in the wrong "
-"place!)\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t</variablelist>\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:430
-msgid ""
-"      <para>\n"
-"          The items in this menu relate to\n"
-"          <application>Evolution</application> mail messages. Most of\n"
-"          them require you to have a message selected, and are also\n"
-"          available by right-clicking on a message in the message\n"
-"          list.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"          Las opciones de este menú se refieren a los mensajes de correo de\n"
-"          <application>Evolution</application>. La mayoría de ellos\n"
-"          requieren que haya un mensaje seleccionado, y están tambien\n"
-"          disponibles pulsando con el botón derecho sobre un mensaje de la\n"
-"          lista de mensajes.\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:438
-msgid ""
-"      <para>\n"
-"          The items in this menu relate to \n"
-"          <application>Evolution</application> mail folders.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"          Estos elementos de este menú se refieren a las carpetas de \n"
-"          correo de <application>Evolution</application>.\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:443
-msgid ""
-"      <para>\n"
-"          You can:\n"
-"          <variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Mark all as Read</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t      <application>Evolution</application> keeps track of which messages \n"
-"\t      you've seen;  to mark everything in a folder as read, choose this "
-"item.\n"
-"\t      You can mark a single message as read by right-clicking it in the "
-"message bar.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Delete All</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t      This is a favorite item of everyone with too much junk-mail: one "
-"click, and it \n"
-"\t      deletes every message in the current folder. \n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Expunge</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"                 Empties the trash folder, erasing messages permanently. \n"
-"                 Once you've done this, they're gone for good.\n"
-"\t       </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Configure Folder</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Use this item to set the file format in which\n"
-"              <application>Evolution</application> stores mail. You\n"
-"              can choose from standard UNIX-style\n"
-"              <systemitem><filename>mbox</filename></systemitem>\n"
-"              files, or the\n"
-"              <systemitem><filename>mh</filename></systemitem> format.\n"
-"              Converting large mailboxes may take a long time, and\n"
-"              it's a good idea to have a backup copy beforehand.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t</variablelist>\n"
-"       </para>\n"
-msgstr ""
-"      <para>\n"
-"          Usted puede:\n"
-"          <variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Marcar todos como Leídos</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t      <application>Evolution</application> se acuerda de que mensajes ha \n"
-"\t      leído;  para marcar todos los mensajes de una carpeta como leídos "
-"elija esta opción.\n"
-"\t      Puede marcar un solo mensaje como leído pulsando con el botón "
-"derecho en la barra de mensajes.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Borrar Todos</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t      Esta es la opción favorita de todo aquel con demasiado correo "
-"basura: un click, y borra \n"
-"\t      todos los mensajes de la carpeta actual. \n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Comprimir</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"                 Vacia la carpeta de la papelera, borrando los mensajes "
-"permanentemente. \n"
-"                 Un vez que ha echo esto, son eliminados para siempre.\n"
-"\t       </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Configurar Carpeta</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Use esta opción para seleccionar el formato de archivo en el\n"
-"              que <application>Evolution</application> guarda el correo.\n"
-"              Puede elegir entre archivos tipo\n"
-"              <systemitem><filename>mbox</filename></systemitem> estandar\n"
-"              al estilo UNIX, o el formato\n"
-"              <systemitem><filename>mh</filename></systemitem>.\n"
-"              Convertir buzones grandes tarda mucho tiempo, y es una buena\n"
-"              idea tener una copia de seguridad antes de la conversión.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t</variablelist>\n"
-"       </para>\n"
-
-#: tmp/menuref.sgml.h:490
-msgid ""
-"      <para>\n"
-"         At the top of the message list is the message list heading\n"
-"         bar; you can click on an individual heading &mdash;\n"
-"         <guilabel>Subject</guilabel>, for example, to have the\n"
-"         message list sorted by that attribute.  However, if you right\n"
-"         click on a heading, you'll get the following menu:\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"         En la parte superior de la lista de mensajes está la cabecera de\n"
-"         la lista de mensajes. Puede pulsar en cualquiera de los títulos\n"
-"         individuales &mdash;\n"
-"         <guilabel>Asunto</guilabel>, por ejemplo, para ordenar la lista\n"
-"         de mensajes por ese atributo.  Eso si, si pulsa el botón derecho\n"
-"         sobre uno de los títulos, obtendrá el siguiente menú:\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:498
-msgid ""
-"      <para>\n"
-"         FIXME: this menu is copied and pasted entirely from somewhere\n"
-"         else.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"         ARREGLAME: este menú esta copiado y pegado completamente de otro\n"
-"         sitio.\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:503
-msgid ""
-"      <para>\n"
-"         The contents of the Edit menu are currently so borked that I\n"
-"         refuse to document them right now. (That means FIXME). They\n"
-"         should be:\n"
-"\n"
-"         <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Item</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Description\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Item</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Description\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t  \n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>Item</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"              Description\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"         El contenido del menu Editar no esta todavía fijo, así que no lo\n"
-"         voy a documentar todavía. (Esto significa ARREGLAME). Deberian\n"
-"         ser:\n"
-"\n"
-"         <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Elemento</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Descripción\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Elemento</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Descripción\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t  \n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>Elemento</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"              Descripción\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:531
-msgid ""
-"      <para>\n"
-"         This menu allows you to look at different appointments, and\n"
-"         set the way you look at them, without having to move back to\n"
-"         the <interface>Main Window</interface>. It contains:\n"
-"         <variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guisubmenu>Previous</guisubmenu></term>\n"
-"\t    <listitem><para>\n"
-"               The items in this submenu will take you to appointments\n"
-"               prior to the current one. (FIXME: describe).\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guisubmenu>Next</guisubmenu></term>\n"
-"\t    <listitem><para>\n"
-"               The items in this submenu will take you to appointments\n"
-"               scheduled to occur after the current one. (FIXME: describe).\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Calendar</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"               FIXME: What does this item do?\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guisubmenu>Toolbars</guisubmenu></term>\n"
-"\t    <listitem><para>\n"
-"             The <guisubmenu>Toolbars</guisubmenu> submenu \n"
-"             allows you to choose which toolbars\n"
-"             are displayed in the \n"
-"             <interface>Appointment Editor</interface>. They are:\n"
-"             <itemizedlist>\n"
-"\t\t  <listitem><para>\n"
-"                    <guimenuitem>Standard</guimenuitem> &mdash;\n"
-"                    Toggle the standard toolbar on and off.\n"
-"                   </para></listitem>\n"
-"\n"
-"\t\t  <listitem><para>\n"
-"                    <guimenuitem>Formatting</guimenuitem> &mdash;\n"
-"                    Toggle the formatting toolbar on and off.\n"
-"                   </para></listitem>\n"
-"\t\n"
-"\t\t  <listitem><para>\n"
-"                    <guimenuitem>Customize</guimenuitem> &mdash;\n"
-"                    Select the contents of the formatting and standard "
-"toolbars.\n"
-"                   </para></listitem>\n"
-"\t\t</itemizedlist>\n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"         Este menú le permite ver distintas citas, y configurar la forma de\n"
-"         verlas, sin tener que volver a la <interface>Ventana \n"
-"         Principal</interface>. Contiene:\n"
-"         <variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guisubmenu>Previa</guisubmenu></term>\n"
-"\t    <listitem><para>\n"
-"               La opción de este sub-menú le llevará a la cita anterior a\n"
-"               la actual. (FIXME: describe).\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guisubmenu>Suiguiente</guisubmenu></term>\n"
-"\t    <listitem><para>\n"
-"               La opción de este sub-menú le llevará a la cita programada\n"
-"               para despues de la actual. (FIXME: describe).\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Calendario</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"               FIXME: What does this item do?\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guisubmenu>Barras de Herramientas</guisubmenu></term>\n"
-"\t    <listitem><para>\n"
-"             El sub-menú <guisubmenu>Barras de Herramientas</guisubmenu> \n"
-"             le permite elegir que barras de herramientas son mostradas en\n"
-"             el <interface>Editor de Citas</interface>. Estas son:\n"
-"             <itemizedlist>\n"
-"\t\t  <listitem><para>\n"
-"                    <guimenuitem>Estandar</guimenuitem> &mdash;\n"
-"                    Activa y desactiva la barra de herramientas estandar.\n"
-"                   </para></listitem>\n"
-"\n"
-"\t\t  <listitem><para>\n"
-"                    <guimenuitem>Formato</guimenuitem> &mdash;\n"
-"                    Activa y desactiva la barra de herramientas de formato.\n"
-"                   </para></listitem>\n"
-"\t\n"
-"\t\t  <listitem><para>\n"
-"                    <guimenuitem>Personalizada</guimenuitem> &mdash;\n"
-"                    Selecciona los contenidos de las barras de herramientas "
-"de formato y de la estandar.\n"
-"                   </para></listitem>\n"
-"\t\t</itemizedlist>\n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:588
-msgid ""
-"      <para>\n"
-"         This menu contains five items:\n"
-"         <variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>Save</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             \n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\t\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>Save As</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"              Allows you to save the contact as an external \n"
-"              file in the <glossterm linkend=\"vcard\">VCard</glossterm> "
-"format. \n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\t\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>Print</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             Prints the current contact.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\t\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>Delete</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             Deletes the current contact.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\t\n"
-"\n"
-"  \n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>Close</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"              Closes the Contact Editor without saving.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\t\n"
-"\n"
-"\t</variablelist>  \n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"         Este menú contiene cinco opciones:\n"
-"         <variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>Guardar</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             \n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\t\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>Guardar como</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"              Le permite guardar el contacto como un archivo externo en el \n"
-"              formato <glossterm linkend=\"vcard\">VCard</glossterm>. \n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\t\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>Imprimir</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             Imprime el contacto actual.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\t\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>Borrar</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             Borra el contacto actual.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\t\n"
-"\n"
-"  \n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>Cerrar</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"              Cierra el Editor de Contactos sin guardar.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\t\n"
-"\n"
-"\t</variablelist>  \n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:633
-msgid ""
-"      <para>\n"
-"         This menu contains four items, including the\n"
-"         <guisubmenu>Forms</guisubmenu> submenu, which allows you to\n"
-"         alter calendar forms and create your own entries.  None of\n"
-"         this works yet, though.\n"
-"\n"
-"         <variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Spelling</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Checks the spelling of your calendar entry.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Check Names</guimenuitem></term>\n"
-"\t    <listitem><para> Checks the names listed here against\n"
-"\t    those in your address book.\n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Address Book</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             FIXME: ?\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guisubmenu>Forms</guisubmenu> Submenu</term>\n"
-"\t    <listitem><para>\n"
-"               The Forms submenu lets you alter the\n"
-"\t       appearance of Calendar Forms. \n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"         Este menú contiene cuatro opciones, incluyendo el sub-menú\n"
-"         <guisubmenu>Formularios</guisubmenu>, el caul le permite modificar\n"
-"         los formularios de los calendararios y crear sus propias entradas.\n"
-"         Esto todavia no funciona.\n"
-"\n"
-"         <variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Corrector Ortográfico</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Comprueba la ortografía en las entradas del calendario.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Comprobar Nombres</guimenuitem></term>\n"
-"\t    <listitem><para> Comprueba los nombres aquí enumerados contra los de\n"
-"\t    su agenda de direcciones.\n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Agenda de Direcciones</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             FIXME: ?\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guisubmenu>Formularios</guisubmenu> Sub-menú</term>\n"
-"\t    <listitem><para>\n"
-"               El sub-menú Formularios le permite modificar la apariencia "
-"de\n"
-"\t       de los Formularios del Calendario. \n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:675
-msgid ""
-"      <para>\n"
-"         This menu contains one item:\n"
-"\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Search for\n"
-"\t    Contacts</guimenuitem></term> <listitem><para> Brings up\n"
-"\t    the in-depth search window. <xref\n"
-"\t    linkend=\"contact-search\"> describes how to use this\n"
-"\t    feature.  </para></listitem>\n"
-"            </varlistentry>\n"
-"        </variablelist>\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"         Este menú contiene una opción:\n"
-"\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Buscar un\n"
-"\t    Contacto</guimenuitem></term> <listitem><para> Abre una ventana\n"
-"\t    para una busqueda en profundidad. <xref\n"
-"\t    linkend=\"contact-search\"> describe como usar esta característica.\n"
-"\t    </para></listitem>\n"
-"            </varlistentry>\n"
-"        </variablelist>\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:689
-msgid ""
-"      <para>\n"
-"         This menu contains only one item:\n"
-"\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>New Directory Server</guimenuitem></term> "
-"<listitem><para> Brings up\n"
-"\t    the in-depth search window. <xref\n"
-"\t    linkend=\"config-prefs-contact-ldap-add\"> describes how to use this\n"
-"\t    feature.  </para></listitem>\n"
-"            </varlistentry>\n"
-"        </variablelist>\n"
-"\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"         Este menú contiene unia sola opción:\n"
-"\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Nuevo Servidor de Directorio</guimenuitem></term> "
-"<listitem><para> Muestra una ventana\n"
-"\t    de búsqueda en profundidad. <xref\n"
-"\t    linkend=\"config-prefs-contact-ldap-add\"> describe como usar esta\n"
-"\t    característica.  </para></listitem>\n"
-"            </varlistentry>\n"
-"        </variablelist>\n"
-"\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:703
-msgid ""
-"      <para>\n"
-"         This menu contains several items, including a <guisubmenu>New</"
-"guisubmenu> submenu\n"
-"         that is identical to that in the \n"
-"         <link linkend=\"menuref-universal-file\">main window's file menu</"
-"link>.\n"
-"         Its other contents are:\n"
-"         <variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Send</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             Opens a mail message with the appointment attached to it.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Save</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Save this appointment in the existing location and name. If "
-"you have not yet\n"
-"              chosen a location and name, this is the same as "
-"<guimenuitem>Save As</guimenuitem>.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Save As</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Choose a location and name for this appointment, and save it.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Delete</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Deletes the appointment.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Move to Folder</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Chose a folder, and move the appointment into it.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Copy to Folder</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Chose a folder, and put a copy of the appointment into it.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Page Setup Submenu</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             This menu contains two items:\n"
-"                <itemizedlist>\n"
-"\t\t  <listitem><para>\n"
-"                   <guimenuitem>Memo Style</guimenuitem> &mdash;\n"
-"                    FIXME: What does this do?\n"
-"                   </para></listitem>\n"
-"\n"
-"\t\t  <listitem><para>\n"
-"                    <guimenuitem>Define Print Styles</guimenuitem> &mdash;\n"
-"                    FIXME: What does this do?\n"
-"                  </para></listitem>\n"
-"\t\t</itemizedlist>\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Print Preview</guimenuitem></term>\n"
-"\t    <listitem><para> Shows you what your appointment will look\n"
-"\t    like if you print it. See <xref linkend=\"usage-print\">\n"
-"\t    for details on printing and the Print Preview function.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Print</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Prints the appointment without preview.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Properties</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             FIXME: What does this do?\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Close</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             Close the appointment editor window.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"         Este menú contiene varias opciones, incluyendo un sub-menú "
-"<guisubmenu>Nuevo</guisubmenu> que es identico al del \n"
-"         <link linkend=\"menuref-universal-file\">menú archivo de la ventana "
-"principal</link>.\n"
-"         Sus otros contenidos son:\n"
-"         <variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Enviar</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             Abre un mensaje de correo con la cita adjunta a el.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Guardar</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Guarda esta cita en la posición y nombre actual. Si todavía no "
-"ha elegido\n"
-"              una posición y un nombre, esto es lo mismo que "
-"<guimenuitem>Guardar Como</guimenuitem>.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Guaradar Como</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Eliga una posición y un nombre para esta cita, y guardela.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Borrar</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Borra la cita.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Mover a una Carpeta</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Elija una carpeta, y mueva a ella la cita.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Copiar a una Carpeta</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Elija una carpeta, y ponga en ella una copia de la cita.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t   <term><guimenuitem>Sub-menú de Configuración de Página</guimenuitem></"
-"term>\n"
-"\t    <listitem><para>\n"
-"             Este menú contiene dos opciones:\n"
-"                <itemizedlist>\n"
-"\t\t  <listitem><para>\n"
-"                   <guimenuitem>Estilo del Memorando</guimenuitem> &mdash;\n"
-"                    FIXME: What does this do?\n"
-"                   </para></listitem>\n"
-"\n"
-"\t\t  <listitem><para>\n"
-"                    <guimenuitem>Definir Estilos de Impresión</guimenuitem> "
-"&mdash;\n"
-"                    FIXME: What does this do?\n"
-"                  </para></listitem>\n"
-"\t\t</itemizedlist>\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Vista Previa</guimenuitem></term>\n"
-"\t    <listitem><para> Muestra el aspecto que tendrán su cita si la\n"
-"      imprime. Vea <xref linkend=\"usage-print\">\n"
-"\t    para más detalles sobre imprimir y la función de Vista Previa.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Imprimir</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Imprime la cita sin vista previa.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Propiedades</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             FIXME: What does this do?\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Cerrar</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             Cierra la ventana del editor de citas.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:809
-msgid ""
-"      <para>\n"
-"         This menu contains two items, neither of which\n"
-"         have any functionality yet:\n"
-"         <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Font</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             FIXME: ?\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Paragraph</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             FIXME: ?\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"         Thite menú contiene dos opciones, ninguna de las cuales tiene\n"
-"         funcionalidad alguna todavía:\n"
-"         <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Fente</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             FIXME: ?\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Parrafo</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             FIXME: ?\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:830
-msgid ""
-"      <para>\n"
-"         This menu is empty.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"         Este menú está vacío.\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:834
-msgid ""
-"      <para>\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenu>Open</guimenu></term>\n"
-"\t      <listitem><para>\n"
-"\t\t Open a text file or a draft mail message.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t    <varlistentry>\n"
-"\t      <term><guimenu>Save</guimenu></term>\n"
-"\t      <listitem><para>\n"
-"\t\t Save a mail message as a text file.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t    <varlistentry>\n"
-"\t      <term><guimenu>Save As</guimenu></term>\n"
-"\t      <listitem><para> \n"
-"\t\tChoose a file name and location for\n"
-"\t\ta message you want to save as a text file.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t    <varlistentry>\n"
-"\t      <term><guimenu>Save in Folder</guimenu></term>\n"
-"\t      <listitem><para>\n"
-"\t\t Save a message as a draft, rather than \n"
-"\t\t as a separate text file.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t    <varlistentry>\n"
-"\t      <term><guimenu>Insert Text File</guimenu></term>\n"
-"\t      <listitem><para>\n"
-"\t\t   Open a text file and insert it into \n"
-"\t\t   the current message. (FIXME: belongs under \"Insert\").\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\t  \n"
-"\t    <varlistentry>\n"
-"\t      <term><guimenu>Send Now</guimenu></term>\n"
-"\t      <listitem><para>\n"
-"\t\t  Sends the message immediately.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t    <varlistentry>\n"
-"\t      <term><guimenu>Send Later</guimenu></term>\n"
-"\t      <listitem><para>\n"
-"\t\t  Queue \n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenu>Close</guimenu></term>\n"
-"\t    <listitem><para>\n"
-"\t\t Closes the message composer.  If you have not done so, \n"
-"\t\t <application>Evolution</application>\n"
-"\t\t will ask you if you want to save your message.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t      <term><guimenu>Abrir</guimenu></term>\n"
-"\t      <listitem><para>\n"
-"\t\t Abre un archivo de texto o el borrador de un mensaje.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t    <varlistentry>\n"
-"\t      <term><guimenu>Guardar</guimenu></term>\n"
-"\t      <listitem><para>\n"
-"\t\t Guarda un mensaje de correo como un archivo de texto.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t    <varlistentry>\n"
-"\t      <term><guimenu>Guardar Como</guimenu></term>\n"
-"\t      <listitem><para> \n"
-"\t\tElija un nombre de archivo y un lugar para\n"
-"\t\tel mensaje que quiere guardar como un archivo de texto.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t    <varlistentry>\n"
-"\t      <term><guimenu>Guardar en una Carpeta</guimenu></term>\n"
-"\t      <listitem><para>\n"
-"\t\t Guarda un mensaje como un borrador, en lugar de como \n"
-"\t\t un archivo de texto independiente.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t    <varlistentry>\n"
-"\t      <term><guimenu>Insertar Archivo de Texto</guimenu></term>\n"
-"\t      <listitem><para>\n"
-"\t\t   Abre un archivo de texto y lo inserta en el mensaje \n"
-"\t\t   actual. (FIXME: belongs under \"Insert\").\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\t  \n"
-"\t    <varlistentry>\n"
-"\t      <term><guimenu>Enviar Ahora</guimenu></term>\n"
-"\t      <listitem><para>\n"
-"\t\t  Envia el mensaje inmediatamente.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t    <varlistentry>\n"
-"\t      <term><guimenu>Enviar más Tarde</guimenu></term>\n"
-"\t      <listitem><para>\n"
-"\t\t  Lo pone en la cola de mensajes \n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenu>Cerrar</guimenu></term>\n"
-"\t    <listitem><para>\n"
-"\t\t Cierra el compositor de mensajes.  Si no lo ha echo ya, \n"
-"\t\t <application>Evolution</application>\n"
-"\t\t le preguntará si quiere guardar su mensaje.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:899
-msgid ""
-"      <para>\n"
-"        The <guimenu>Insert</guimenu> menu holds tools that allow you\n"
-"        to include images, horizontal rules, and other objects\n"
-"        in the body of your message. The tools are:\n"
-"        <variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Image</guimenuitem></term>\n"
-"\t    <listitem><para> \n"
-"               This tool will prompt you to select an image file to \n"
-"               insert into your HTML message.  For text messages, this\n"
-"               is the same as attaching an image file.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Link</guimenuitem></term>\n"
-"\t    <listitem><para> \n"
-"               Opens the <interface>link creation window</interface>, \n"
-"               which lets you specify the URL and text description\n"
-"               for a link in your message.  This only works with HTML \n"
-"               messages.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Rule</guimenuitem></term>\n"
-"\t    <listitem><para>    \n"
-"             Opens the<interface> horizontal rule creation dialog</"
-"interface>, which lets you\n"
-"\t     create an HTML horizontal rule.  For more information,\n"
-"\t     see <xref linkend=\"usage-mail-getnsend-send-html\">.\n"
-"             This tool only works with HTML messages.\n"
-"\t     </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Text File</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Open a text file and insert it into the current message.\n"
-"               This tool works with both plain text and HTML messages.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        El menú <guimenu>Insertar</guimenu> contiene herramientas que le\n"
-"        permiten incluir imágenes, reglas horizontales, y otros objetos en\n"
-"        el cuerpo del mensaje. Las herramientas son:\n"
-"        <variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Imagen</guimenuitem></term>\n"
-"\t    <listitem><para> \n"
-"               Esta herramienta le pedirá que seleccione una imagen para\n"
-"               insertarla en su mensaje en HTML.  Para mensajes de texto,\n"
-"               esto es lo mismo que adjuntar la imagen.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Enlace</guimenuitem></term>\n"
-"\t    <listitem><para> \n"
-"              Abre la <interface>ventana de creación de enlaces</"
-"interface>,\n"
-"              que le permite especificar la URL y un descripción para el\n"
-"              enlace de su mensaje.  Tan solo funciona con mensajes en\n"
-"              HMTLs.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Regla</guimenuitem></term>\n"
-"\t    <listitem><para>    \n"
-"             Abre el <interface>diálogo de creación de reglas horizontales</"
-"interface>, el cual le permite\n"
-"\t     crear una regla horizontal en HTML.  Para más información, vea\n"
-"\t     <xref linkend=\"usage-mail-getnsend-send-html\">.\n"
-"             Esta herramienta solo funciona con mensajes en HTML.\n"
-"\t     </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Archivo de Texto</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"\t       Abre un archivo de texto y lo inserta en el mensaje actual.\n"
-"               Esta herramienta funciona tanto con mensajes de texto como\n"
-"               mensajes en HTML.\n"
-"\t      </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:944
-msgid ""
-"      <para>\n"
-"        The <guimenu>View</guimenu> menu controls the way messages are\n"
-"        displayed, and how much of the message, its headers, and\n"
-"        attachments appear.  It contains:\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Show Attachments</guimenuitem></term>\n"
-"\t    <listitem><para> \n"
-"              Toggles the display of attachments.  When this item is "
-"selected,\n"
-"              <application>Evolution</application> will create a separate "
-"pane\n"
-"              of the composition window to show what attachments you are "
-"appending\n"
-"              to the message. \n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        El menú <guimenu>Vista</guimenu> controla la manera en que se\n"
-"        muestran sus mensajes, y cuanto del mensaje, de su cabecera y de "
-"los\n"
-"        adjuntos se muestra.  Contiene:\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Mostrar Adjuntos</guimenuitem></term>\n"
-"\t    <listitem><para> \n"
-"              Activa el mostrar los adjuntos.  Cuando esta opción está "
-"seleccionada,\n"
-"              <application>Evolution</application> creará una caja separada\n"
-"de la ventana\n"
-"              del compositor de mensajes para mostrar que archivos adjuntos "
-"está añadiendo\n"
-"              al mensaje. \n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:961
-msgid ""
-"      <para>\n"
-"        The Calendar's <guimenu>View</guimenu> menu contains the following "
-"items:\n"
-"\n"
-"         <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Toggle the Shortcut Bar on and off with this "
-"item.              \n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Show Folder Bar</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             Toggle the folder bar on and off with this item. \n"
-"             See <xref linkend=\"usage-mainwindow-folderbar\"> for \n"
-"             more information about the folder bar.     \n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t\t  \n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>View By Day</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             Switch to the day view for your calendar.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\t  \n"
-"\n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>View Five Days</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             View five calendar days at once. \n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\t  \n"
-"\n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>View by Week</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             Switch the calendar view to full week mode.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"  \n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>View By Month</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             Look at a month at a time.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        El menú <guimenu>Vista</guimenu> del calendario contiene las "
-"siguientesins opciones:\n"
-"\n"
-"         <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Mostrar la Barra de Atajos</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Active y desactive la barra de atajos con esta opción.    \n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Mostrar la Barra de Carpetas</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             Active y desactive la barra de carpetas con esta opción. \n"
-"             Vea <xref linkend=\"usage-mainwindow-folderbar\"> para \n"
-"             más información acerca de la barra de carpetas.     \n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t\t  \n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>Vista por Días</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             Cambia el calendario a la vista diaria.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\t  \n"
-"\n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>Vista Cinco Días</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             Muestra cinco días del calendario de una vez. \n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\t  \n"
-"\n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>Vista por Semanas</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             Cambia el calendario a la vista semanal.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"  \n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>Vista por meses</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             Vea todo un mes al tiempo.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:1011
-msgid ""
-"      <para>\n"
-"        This menu contains the following items:\n"
-"\n"
-"         <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Toggle the Shortcut Bar on and off with this "
-"item.              \n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Show Folder Bar</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             Toggle the folder bar on and off with this item. \n"
-"             See <xref linkend=\"usage-mainwindow-folderbar\"> for \n"
-"             more information about the folder bar.     \n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t\t  \n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>As Table</guimenuitem> / <guimenuitem>As Minicards</"
-"guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             View your contacts as a table.  \n"
-"             When in table-view mode, this menu item reads \n"
-"             <guimenuitem>As Minicards</guimenuitem>, and changes the view\n"
-"             back to the minicard format.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\t  \n"
-"\t</variablelist>      \n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        Este menú contiene las siguiente opciones:\n"
-"\n"
-"         <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Mostrar Barra de Atajos</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Active y desactive la barra de atajos con esta "
-"opción.          \n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Muestra la Barra de Carpetas</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             Active y descative la barra de carpetas con esta opción. \n"
-"             Vea <xref linkend=\"usage-mainwindow-folderbar\"> para \n"
-"             más información acerca de la barra de carpetas.     \n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t\t  \n"
-"\t  <varlistentry>\n"
-"\t  <term><guimenuitem>Como un Tabla</guimenuitem> / <guimenuitem>As "
-"Minicards</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             Vea sus contactos como una tabla.  \n"
-"             Cuando esta en el modo tabla, está opción del menú aparece\n"
-"             como <guimenuitem>Como Minitarjetas</guimenuitem>, y vuelve a\n"
-"             cambiar la vista al formato minitarjetas.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\t  \n"
-"\t</variablelist>      \n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:1043
-msgid ""
-"      <para>\n"
-"        This menu contains:\n"
-"\n"
-"         <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Schedule Meeting</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Brings up the <interface>Meeting Invitation</interface> "
-"window, \n"
-"              described in <xref linkend=\"usage-calendar-apts\">.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Cancel Invitation</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Cancels the event, notifying all attendees.  You may be "
-"prompted \n"
-"              to specify an invitation message.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Forward as vCalendar</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Opens the message composer with the current event attached.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Forward as Text</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Opens the message composer with a text description of the "
-"current\n"
-"              event included in the message body.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        Este menú contiene:\n"
-"\n"
-"         <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Fijar una Reunión</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Aparece la ventana de <interface>Invitación de Reunión</"
-"interface>, \n"
-"              descrita en <xref linkend=\"usage-calendar-apts\">.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Cancelar Invitación</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Cancela el evento, notificandoselo a todos los asistentes. "
-"Puede que le pida que \n"
-"              especifique un mensaje.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Reenviar como vCalendar</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Abre el compositor de mensajes con el evento actual adjunto.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Reenviar como Texto</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Abre el compositor de mensajes con una descripción en texto "
-"del evento actual\n"
-"              incluida en el cuerpo del mensaje.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:1080
-msgid ""
-"      <para>\n"
-"        This menu contains: (FIXME: Insert Content Here)\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>File</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             Choose a file to append to your appointment or appointment "
-"request.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Item</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             FIXME: ?\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Object</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             FIXME: ?\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        Este menú contiene: (FIXME: Insert Content Here)\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Archivo</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             Elija un archivo para incluir a la cita o al petición de cita.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Elemento</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             FIXME: ?\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Objeto</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             FIXME: ?\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:1108
-msgid ""
-"      <para>\n"
-"        This menu is currently empty.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        Este menú está actualmente vacio.\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:1112
-msgid ""
-"      <para>\n"
-"        This menu lets you control the way\n"
-"        <application>Evolution</application> displays your information\n"
-"        for you.\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Show Shortcut Bar</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Toggle the shortcut bar on and off with this "
-"item.             \n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Show Folder Bar</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             Toggle the folder bar on and off with this item. \n"
-"             See <xref linkend=\"usage-mainwindow-folderbar\"> for \n"
-"             more information about the folder bar.             \n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Threaded Message List</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"               This item controls whether your message list is displayed by "
-"thread \n"
-"               or by other criteria.  The default order is by date; see\n"
-"               <xref linkend=\"usage-mail-listorder\"> for information about "
-"the\n"
-"               order of the message list.\n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        Este menú le permite controlar el modo en que\n"
-"        <application>Evolution</application> le muestra su información.\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Mostrar Barra de Atajos</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Active y desactive la barra de atajos con esta opción.       \n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Mostrar Barra de Carpetas</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             Active y desactive la barra de carpetas con esta opción. \n"
-"             Vea <xref linkend=\"usage-mainwindow-folderbar\"> para \n"
-"             más información acerca de la barra de carpetas.           \n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Lista de Mensajes Encadenados</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"               Esta opción controla si la lista de sus mensajes se muestra "
-"siguiendo la cadena de la discusión \n"
-"               o por otro criterio.  La ordenación por defecto es por "
-"fecha.\n"
-"               Vea <xref linkend=\"usage-mail-listorder\"> para más\n"
-"información acerca de \n"
-"               como ordenar la lista de mensajes.\n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-
-#: tmp/menuref.sgml.h:1145
-msgid ""
-"      <para>\n"
-"      <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Mail Filters</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             Edit your mail filters here.  \n"
-"             See <xref linkend=\"usage-mail-organize-filters\">\n"
-"             for more information about mail filtering.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t  \n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Virtual Folder Editor</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Create, edit, and delete Virtual Folders (<glossterm>vFolders</"
-"glossterm>)\n"
-"               with this tool. \n"
-"              To learn about using vFolders with mail, see \n"
-"              <xref linkend=\"usage-mail-organize-vfolders\">.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t  \n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Mail Configuration</guimenuitem></term>\n"
-"\t    <listitem><para> \n"
-"               Tools for setting up all your mail account preferences.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Manage Subscriptions</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"               Tools for newsgroup and IMAP folder subscriptions.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Forget Passwords</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              This item will cause <application>Evolution</application>\n"
-"\t      to forget what your password is.\n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t  \n"
-"\t</variablelist>\n"
-"       </para>\n"
-msgstr ""
-"      <para>\n"
-"      <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Filtros de Correo</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"             Edite aqui sus filtros de correo.  \n"
-"             Vea <xref linkend=\"usage-mail-organize-filters\">\n"
-"             para más información acerca de los filtrar correo.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t  \n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Editor de Carpetas Virtuales</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Cree, edite, y borre carpetas virtuales (<glossterm>vFolders</"
-"glossterm>)\n"
-"               con esta herramienta. \n"
-"              Para aprender acerca de como usar carpetas virtuales con su \n"
-"              correo, vea <xref linkend=\"usage-mail-organize-vfolders\">.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t  \n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Configuración del Correo</guimenuitem></term>\n"
-"\t    <listitem><para> \n"
-"               Herramientas para configurar las preferencias de sus cuentas "
-"de correo.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Administrar Suscripciones</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"               Herramientas para suscribirse a grupos de noticias y para las "
-"carpetas IMAP.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>Olvidar Contraseña</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"              Esta opción hara que <application>Evolution</application>\n"
-"\t      olvide sus contraseñas.\n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t  \n"
-"\t</variablelist>\n"
-"       </para>\n"
-
-#: tmp/menuref.sgml.h:1191
-msgid ""
-"      <para>\n"
-"      <variablelist>\n"
-"\t<varlistentry>\n"
-"\t  <term><guimenuitem>Help Index</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             Displays the table of contents for this document.\n"
-"           </para></listitem>\n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"\t  <term><guimenuitem>Getting Started</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"              A quick look around, and a summary of the things\n"
-"              <application>Evolution</application> can do for you.\n"
-"           </para></listitem>\n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"\t  <term><guimenuitem>Using the Mailer</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"              An in-depth tour of <application>Evolution</application> "
-"Mail.\n"
-"           </para></listitem>\n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"\t  <term><guimenuitem>Using the Calendar</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             A step-by-step guide to using the Calendar.\n"
-"           </para></listitem>\n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"\t  <term><guimenuitem>Using the Contact Manager</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"            Find your way around the Contact Manager.\n"
-"           </para></listitem>\n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"\t  <term><guimenuitem>Submit Bug Report</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             If you don't report them, they can't fix them.  Select this "
-"item to let the \n"
-"             developers know what's wrong.\n"
-"           </para></listitem>\n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"\t  <term><guimenuitem>About Evolution</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"              Displays a window with information about the application and "
-"its authors.\n"
-"              This has the same information as <xref linkend=\"authors\">.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"       </para>\n"
-msgstr ""
-"      <para>\n"
-"      <variablelist>\n"
-"\t<varlistentry>\n"
-"\t  <term><guimenuitem>Índice de la Ayuda</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             Muestra la tabla de contenidos de este documento.\n"
-"           </para></listitem>\n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"\t  <term><guimenuitem>Comenzando</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"              Una vista rápida, y un resumen de las cosas que\n"
-"              <application>Evolution</application> puede hacer por usted.\n"
-"           </para></listitem>\n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"\t  <term><guimenuitem>Usando el Correo</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"              Una vista en profundidad del correo de <application>Evolution</"
-"application>.\n"
-"           </para></listitem>\n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"\t  <term><guimenuitem>Usando el Calendario</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             Una guía paso a paso sobre como usar el calendario.\n"
-"           </para></listitem>\n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"\t  <term><guimenuitem>Usando el Administrador de Contactos</guimenuitem></"
-"term>\n"
-"\t  <listitem><para>\n"
-"            Manejese con el administrador de contactos.\n"
-"           </para></listitem>\n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"\t  <term><guimenuitem>Enviar Reportes de Fallo</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"             Si usted no se los dice, no podrán arreglarlos.  Selececion "
-"esta opción para hacer saber a\n"
-"             los desarrolladores lo que falla.\n"
-"           </para></listitem>\n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"\t  <term><guimenuitem>Acerca de Evolution</guimenuitem></term>\n"
-"\t  <listitem><para>\n"
-"              Muestra una ventana con información sobre la aplicación y sus "
-"autores.\n"
-"              Tiene la misma información que <xref linkend=\"authors\">.\n"
-"           </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"       </para>\n"
-
-#: tmp/menuref.sgml.h:1241
-msgid ""
-"      <para> \n"
-"        The <guimenu>Format</guimenu> menu has only one item:\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>HTML</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"                 Toggles HTML mode for the message composer.  When "
-"selected, \n"
-"                 the message is displayed and sent in HTML.  If you have "
-"written a \n"
-"                 message in HTML and turn HTML off, most formatting will be "
-"lost.\n"
-"                 <application>Evolution</application> will attempt to "
-"preserve spacing\n"
-"                 and to remove formatting gracefully, however.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"       </para>\n"
-msgstr ""
-"      <para> \n"
-"        El menú <guimenu>Formato</guimenu> solo tiene una opción:\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guimenuitem>HTML</guimenuitem></term>\n"
-"\t    <listitem><para>\n"
-"                 Activa el modo HTML para el compositor de mensajes.  Cuando "
-"esta seleccionado, \n"
-"                 los mensajes se muestran y se envian en HTML.  Si ha "
-"escrito un mensaje\n"
-"                 en HTML y desactiva la opción HTML, se perderá la mayor "
-"parte del formato.\n"
-"                 Eso si, <application>Evolution</application> intentará "
-"consevar los\n"
-"                 espacios y eliminar el formato con cuidado.\n"
-"\t    </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"       </para>\n"
-
-#: tmp/menuref.sgml.h:1257
-msgid "      <title>Contact Editor File Menu</title>\n"
-msgstr "      <title>Menú Archivo del Editor de Contactos</title>\n"
-
-#: tmp/menuref.sgml.h:1259
-msgid "      <title>Contact Manager Edit Menu</title>\n"
-msgstr "      <title>Menú Editar del Administrador de Contactos</title>\n"
-
-#: tmp/menuref.sgml.h:1261
-msgid "      <title>Contact Manager Tools Menu</title>\n"
-msgstr ""
-"      <title>Menú Herramientas del Administrador de Contactos</title>\n"
-
-#: tmp/menuref.sgml.h:1263
-msgid "      <title>Contact Manager View Menu</title>\n"
-msgstr "      <title>Menú Ver del Administrador de Contactos</title>\n"
-
-#: tmp/menuref.sgml.h:1265
-msgid "      <title>File Menu</title>\n"
-msgstr "      <title>Menú Archivo</title>\n"
-
-#: tmp/menuref.sgml.h:1267
-msgid "      <title>The Appointment Editor's Actions Menu</title>\n"
-msgstr "      <title>El Menú Acciones del Editor de Citas</title>\n"
-
-#: tmp/menuref.sgml.h:1269
-msgid "      <title>The Appointment Editor's Edit Menu</title>\n"
-msgstr "      <title>El Menú Editar del Editor de Citas</title>\n"
-
-#: tmp/menuref.sgml.h:1271
-msgid "      <title>The Appointment Editor's File Menu</title>\n"
-msgstr "      <title>El Menú Archivo del Editor de Citas</title>\n"
-
-#: tmp/menuref.sgml.h:1273
-msgid "      <title>The Appointment Editor's Format Menu</title>\n"
-msgstr "      <title>El Menú Formato del Editor de Citas</title>\n"
-
-#: tmp/menuref.sgml.h:1275
-msgid "      <title>The Appointment Editor's Insert Menu</title>\n"
-msgstr "      <title>El Menú Insertar del Editor de Citas</title>\n"
-
-#: tmp/menuref.sgml.h:1277
-msgid "      <title>The Appointment Editor's Tools Menu</title>\n"
-msgstr "      <title>El Menú Herramientas del Editor de Citas</title>\n"
-
-#: tmp/menuref.sgml.h:1279
-msgid "      <title>The Appointment Editor's View Menu</title>\n"
-msgstr "      <title>El Menú Ver del Editor de Citas</title>\n"
-
-#: tmp/menuref.sgml.h:1281
-msgid "      <title>The Calendar Edit Menu</title>\n"
-msgstr "      <title>El Menú Editar del Calendario</title>\n"
-
-#: tmp/menuref.sgml.h:1283
-msgid "      <title>The Calendar Settings Menu</title>\n"
-msgstr "      <title>El Menú Configuración del Calendario</title>\n"
-
-#: tmp/menuref.sgml.h:1285
-msgid "      <title>The Calendar View Menu</title>\n"
-msgstr "      <title>El Menú Ver del Calendario</title>\n"
-
-#: tmp/menuref.sgml.h:1287
-msgid "      <title>The Edit Menu</title>\n"
-msgstr "      <title>El Menú Edición</title>\n"
-
-#: tmp/menuref.sgml.h:1289
-msgid "      <title>The Help Menu</title>\n"
-msgstr "      <title>El Menú Ayuda</title>\n"
-
-#: tmp/menuref.sgml.h:1291
-msgid "      <title>The Mail Folder Menu</title>\n"
-msgstr "      <title>El Menú Carpetas del Correo</title>\n"
-
-#: tmp/menuref.sgml.h:1293
-msgid "      <title>The Mail Message Menu</title>\n"
-msgstr "      <title>El Menú Mensajes del Correo</title>\n"
-
-#: tmp/menuref.sgml.h:1295
-msgid "      <title>The Mail Settings Menu</title>\n"
-msgstr "      <title>El Menú Configuración del Correo</title>\n"
-
-#: tmp/menuref.sgml.h:1297
-msgid "      <title>The Mail View Menu</title>\n"
-msgstr "      <title>El Menú Ver del Correo</title>\n"
-
-#: tmp/menuref.sgml.h:1299
-msgid "      <title>The Message Composer's Edit Menu</title>\n"
-msgstr "      <title>El Menú Editar del Compositor de Mensajes</title>\n"
-
-#: tmp/menuref.sgml.h:1301
-msgid "      <title>The Message Composer's File Menu</title>\n"
-msgstr "      <title>El Menú Archivo del Compositor de Mensajes</title>\n"
-
-#: tmp/menuref.sgml.h:1303
-msgid "      <title>The Message Composer's Format Menu</title>\n"
-msgstr "      <title>El Menú Formato del Compositor de Mensajes</title>\n"
-
-#: tmp/menuref.sgml.h:1305
-msgid "      <title>The Message Composer's Insert Menu</title>\n"
-msgstr "      <title>El Menú Insertar del Compositor de Mensajes</title>\n"
-
-#: tmp/menuref.sgml.h:1307
-msgid "      <title>The Message Composer's View Menu</title>\n"
-msgstr "      <title>El Menú Ver del Compositor de Mensajes</title>\n"
-
-#: tmp/menuref.sgml.h:1309
-msgid "      <title>The Message Heading Right-Click Menu</title>\n"
-msgstr "      <title>El Menú del Botón Derecho en la Cabecera</title>\n"
-
-#: tmp/menuref.sgml.h:1311
-msgid ""
-"    <para>\n"
-"       <application>Evolution</application> Mail has more specialized\n"
-"       menus, and more specialized menu items, than any other part of\n"
-"       the application.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"       El Correo de <application>Evolution</application> tiene más menús\n"
-"       especializados, y más opciones de menú especializadas, que cualquier\n"
-"       otra parte de la aplicación.\n"
-"    </para>\n"
-
-#: tmp/menuref.sgml.h:1317
-msgid ""
-"    <para>\n"
-"       This window has only one menu: the file menu.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"       Esta ventana solo tiene un menú: el menú archivo.\n"
-"    </para>\n"
-
-#: tmp/menuref.sgml.h:1321
-msgid ""
-"    <para>\n"
-"      The <guimenu>File</guimenu> and <guimenu>Help</guimenu> menus in\n"
-"      the main <application>Evolution</application> window do not\n"
-"      change, because they refer to universal items.  Other menus have\n"
-"      contents that change depending on context.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"      Los menús <guimenu>Archivo</guimenu> y <guimenu>Ayuda</guimenu> de la\n"
-"      ventana principal de <application>Evolution</application> no cambian,\n"
-"      porque se refieren a elementos globales.  Otros menús tienen\n"
-"      contenidos que cambian dependiendo del contexto.\n"
-"    </para>\n"
-
-#: tmp/menuref.sgml.h:1328
-msgid ""
-"    <para>\n"
-"      The Main window of the calendar has the same menus as the main\n"
-"      window of the mail client.  However, their contents vary in a\n"
-"      number of ways.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"      La ventana principal del calendario tiene los mismos menús que la\n"
-"      ventana principal del cliente de correo.  Aunque, sus contenidos\n"
-"      varian de varios modos.\n"
-"    </para>\n"
-
-#: tmp/menuref.sgml.h:1334
-msgid ""
-"    <para>\n"
-"      The message composition window has its own set of menus:\n"
-"      <guimenu>File</guimenu>, which controls operations on files and\n"
-"      data, <guimenu>Edit</guimenu>, for text editing,\n"
-"      <guimenu>Format</guimenu>, which controls the file format of\n"
-"      messages you send, <guimenu>View</guimenu>, to set how you view\n"
-"      the message, and <guimenu>Insert</guimenu>, which holds tools\n"
-"      for embedding files and other items in messages.  Here's what's in "
-"them:\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"      La ventana de composición de mensajes tiene su propio juego de menús:\n"
-"      <guimenu>Archivo</guimenu>, que controla las operaciones sobre los\n"
-"      archivos y los datos, <guimenu>Editar</guimenu>, para la edición de\n"
-"      textos, <guimenu>Formato</guimenu>, que controla el formato de los\n"
-"      mensajes que envía, <guimenu>Vista</guimenu>, que determina como ve "
-"el\n"
-"      mensaje, y <guimenu>Insertar</guimenu>, que tiene herramientas para\n"
-"      incluir archivos y otros objetos en los mensajes.  Aquí esta lo que\n"
-"hay en ellos:\n"
-"    </para>\n"
-
-#: tmp/menuref.sgml.h:1344
-msgid ""
-"    <para>\n"
-"     The contact manager has six menus: <guimenu>File</guimenu>,\n"
-"     <guimenu>Edit</guimenu>, <guimenu>View</guimenu>,\n"
-"     <guimenu>Setting</guimenu>s, <guimenu>Tools</guimenu>, and\n"
-"     <guimenu>Help</guimenu>.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"     El administrador de contactos tiene seis menús:\n"
-"     <guimenu>Archivo</guimenu>, <guimenu>Editar</guimenu>,\n"
-"     <guimenu>Vista</guimenu>, <guimenu>Configuración</guimenu>,\n"
-"     <guimenu>Herramientas</guimenu>, y\n"
-"     <guimenu>Ayuda</guimenu>.\n"
-"    </para>\n"
-
-#: tmp/menuref.sgml.h:1351
-msgid ""
-"    <para>\n"
-"    The appointment editor has its own menus, to help you use its\n"
-"    wide-ranging abilities.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"    El editor de citas tiene sus propios menús, para ayudarle a usar sus\n"
-"    amplias posibilidades.\n"
-"    </para>\n"
-
-#: tmp/menuref.sgml.h:1356
-msgid "    <title>Contact Manager Menus</title>\n"
-msgstr "    <title>Menús del Administrador de Contactos</title>\n"
-
-#: tmp/menuref.sgml.h:1358
-msgid "    <title>Mail Menus</title>\n"
-msgstr "    <title>Menús del Correo</title>\n"
-
-#: tmp/menuref.sgml.h:1360
-msgid "    <title>Menus that are the same everywhere</title>\n"
-msgstr "    <title>Menús que son iguales en todas partes</title>\n"
-
-#: tmp/menuref.sgml.h:1362
-msgid "    <title>The Appointment Editor Menus</title>\n"
-msgstr "    <title>Los Menús del Editor de Citas</title>\n"
-
-#: tmp/menuref.sgml.h:1364
-msgid "    <title>The Calendar Menus</title>\n"
-msgstr "    <title>Los Menús del Calendario</title>\n"
-
-#: tmp/menuref.sgml.h:1366
-msgid "    <title>The Contact Editor Menus</title>\n"
-msgstr "    <title>Los Menús del Editor de Contactos</title>\n"
-
-#: tmp/menuref.sgml.h:1368
-msgid "    <title>The Message Composer Menus</title>\n"
-msgstr "    <title>Los Menús del Compositor de Mensajes</title>\n"
-
-#: tmp/menuref.sgml.h:1370
-msgid ""
-"   <para>\n"
-"     We'll leave this section blank until the UI stabilizes a little\n"
-"     more.\n"
-"   </para>\n"
-msgstr ""
-"    <para>\n"
-"      Dejaremos esta sección en blanco hasta que la UI se estabilize un\n"
-"      poco más.\n"
-"    </para>\n"
-
-#: tmp/menuref.sgml.h:1375
-msgid "   <title>Executive Summary Menus</title>\n"
-msgstr "   <title>Menús del Resumen de Trabajo</title>\n"
-
-#: tmp/menuref.sgml.h:1377
-msgid ""
-"  <para>\n"
-"    <application>Evolution</application>'s menus may not hold the\n"
-"    secret to happiness, they do hold every ability that\n"
-"    <application>Evolution</application> has. This section will serve\n"
-"    as a reference for all those menus, and the capabilites that they\n"
-"    offer you.\n"
-"  </para>\n"
-msgstr ""
-"  <para>\n"
-"    Los menús de <application>Evolution</application> puede que no tengan "
-"el\n"
-"    secreto de la felicidad, pero lo que contienen son todas las\n"
-"    posibilidades de <application>Evolution</application>. Esta sección\n"
-"    servirá como referencia de todos esos menús, y las posibilidades que le\n"
-"    ofrecen.\n"
-"  </para>\n"
-
-#: tmp/menuref.sgml.h:1385
-msgid ""
-"  <para>\n"
-"    In addition, the editor tools for messages, appointments, and\n"
-"    contacts all have menu bars of their own. From left to right, the\n"
-"    menus available to you when you are reading mail are:\n"
-"    <guimenu>File</guimenu>, <guimenu>Edit</guimenu>,\n"
-"    <guimenu>View</guimenu>, <guimenu>Settings</guimenu>,\n"
-"    <guimenu>Message</guimenu>, <guimenu>Folder</guimenu>and\n"
-"    <guimenu>Help</guimenu>.\n"
-"\n"
-"  </para>\n"
-msgstr ""
-"  <para>\n"
-"    Ademas, las herramientas de edición de mensajes, citas, y\n"
-"    contactos todas tienen barras de herramientas propias. De izquierda a\n"
-"    derecha, los menús que tiene disponible cuando está leyendo el correo\n"
-"    son: <guimenu>Archivo</guimenu>, <guimenu>Editar</guimenu>,\n"
-"    <guimenu>Vista</guimenu>, <guimenu>Configuración</guimenu>,\n"
-"    <guimenu>Mensaje</guimenu>, <guimenu>Carpeta</guimenu>and\n"
-"    <guimenu>Ayuda</guimenu>.\n"
-"\n"
-"  </para>\n"
-
-#: tmp/menuref.sgml.h:1396
-msgid ""
-"  <para>\n"
-"    Menus in <application>Evolution</application> are\n"
-"    context-sensitive, which means that they vary depending on what\n"
-"    you're doing.  If you're reading your mail, you'll have\n"
-"    mail-related menus; for your calendar, you'll have\n"
-"    calendar-related menu items.  Some menus, of course, like\n"
-"    <guimenu>Help</guimenu> and <guimenu>File</guimenu> don't much, if\n"
-"    at all, because they have more universal functions.  But you'd\n"
-"    never mark an address card as \"read,\" or set the recurrence for an\n"
-"    email message you've recieved. depending on whether you're looking\n"
-"    at mail, contacts, or calendar information. \n"
-"  </para>\n"
-msgstr ""
-"  <para>\n"
-"    Los menús en <application>Evolution</application> son sensitivos al\n"
-"    contexto, lo que significa que varian dependiendo de lo que esté\n"
-"    haciendo.  Si está leyendo su correo, tendrá menús relacionados con el\n"
-"    correo; para su calendario, tendrá opciones relacionadas con\n"
-"    calendarios.  Algunos menús, naturalmente, como\n"
-"    <guimenu>Ayuda</guimenu> y <guimenu>Archivo</guimenu> no cambian mucho,\n"
-"    si es que lo hacen, porque son funciones más universales.  Pero usted\n"
-"    nunca marcará una tarjeta de dirección como \"leidao\", o pondra\n"
-"    recurrencia a un mensaje que ha recivido. Dependiendo de si esta "
-"mirando\n"
-"    el correo, los contactos, o la información del calendario. \n"
-"  </para>\n"
-
-#: tmp/menuref.sgml.h:1409
-msgid "  <title>Menu Reference</title>\n"
-msgstr "  <title>Referencias de los Menús</title>\n"
-
-#: tmp/menuref.sgml.h:1411
-msgid ""
-"<!--\n"
-"<!DOCTYPE Chapter PUBLIC \"-//GNOME//DTD DocBook PNG Variant V1.1//EN\">\n"
-"-->\n"
-msgstr ""
-"<!--\n"
-"<!DOCTYPE Chapter PUBLIC \"-//GNOME//DTD DocBook PNG Variant V1.1//EN\">\n"
-"-->\n"
diff --git a/help/es.po/preface.sgml.po b/help/es.po/preface.sgml.po
deleted file mode 100644
index 705365fbfc..0000000000
--- a/help/es.po/preface.sgml.po
+++ /dev/null
@@ -1,932 +0,0 @@
-# Translation into Spanish of Evolution docs.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Héctor García Álvarez <hector@scouts-es.org>, 2000.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution-docs\n"
-"POT-Creation-Date: 2001-04-20 13:43+0200\n"
-"PO-Revision-Date: 2000-12-28 15:38+0100\n"
-"Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: tmp/preface.sgml.h:1
-msgid ""
-"\t<para>\n"
-"          Some kinds of words are marked off with special typography:\n"
-"          <simplelist>\n"
-"\t    <member><application>Applications</application></member>\n"
-"\t    <member><command>Commands</command> typed at the command line</"
-"member>\n"
-"\t    <member><guilabel>Labels</guilabel> for interface items</member>\n"
-"\n"
-"            <member> Menu selections look like this:\n"
-"                       <menuchoice>\n"
-"                          <guimenu>Menu</guimenu>\n"
-"                          <guisubmenu>Submenu</guisubmenu> \n"
-"                          <guimenuitem>Menu Item</guimenuitem>\n"
-"                     </menuchoice>\n"
-"            </member>\n"
-"\t    <member><guibutton>Buttons</guibutton> you can\n"
-"            click</member> <member><userinput>Anything you type\n"
-"            in</userinput></member> <member><computeroutput>Text\n"
-"            output from a computer</computeroutput></member>\n"
-"            <member><glossterm linkend=\"apx-gloss\">Words</glossterm>\n"
-"            that are defined in the <xref linkend=\"apx-gloss\">.</member>\n"
-"\t  </simplelist>\n"
-"        </para>\n"
-msgstr ""
-"\t<para>\n"
-"          Algunas clases de palabras están escritas con una tipografía "
-"especial:\n"
-"          <simplelist>\n"
-"\t    <member><application>Aplicaciones</application></member>\n"
-"\t    <member><command>Comandos</command> escritos en la línea de comandos</"
-"member>\n"
-"\t    <member><guilabel>Etiquetas</guilabel> de elementos de la interfaz</"
-"member>\n"
-"\n"
-"            <member> La opcciones de los menús aparecen así:\n"
-"                       <menuchoice>\n"
-"                          <guimenu>Menú</guimenu>\n"
-"                          <guisubmenu>Sub-menú</guisubmenu> \n"
-"                          <guimenuitem>Opción del Menú</guimenuitem>\n"
-"                     </menuchoice>\n"
-"            </member>\n"
-"\t    <member><guibutton>Butones</guibutton> que puede pulsar</member>\n"
-"            <member><userinput>Cualquier cosa que\n"
-"            escribe</userinput></member> <member><computeroutput>Salida\n"
-"            del ordenador en texto</computeroutput></member>\n"
-"            <member><glossterm linkend=\"apx-gloss\">Palabras</glossterm>\n"
-"            que están definidas en el <xref linkend=\"apx-gloss\">.</"
-"member>\n"
-"\t  </simplelist>\n"
-"        </para>\n"
-
-#: tmp/preface.sgml.h:24
-msgid ""
-"        <para>\n"
-"\n"
-"\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term></term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"               </para>\n"
-"\t    </listitem>\n"
-"\t    </varlistentry>\n"
-"\t  </variablelist>\n"
-"\n"
-"\n"
-"        </para>\n"
-msgstr ""
-"        <para>\n"
-"\n"
-"\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term></term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"               </para>\n"
-"\t    </listitem>\n"
-"\t    </varlistentry>\n"
-"\t  </variablelist>\n"
-"\n"
-"\n"
-"        </para>\n"
-
-#: tmp/preface.sgml.h:40
-msgid ""
-"        <para>\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term></term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"               </para>\n"
-"\t    </listitem>\n"
-"\t    </varlistentry>\n"
-"\t  </variablelist>\n"
-"\n"
-"        </para>\n"
-msgstr ""
-"        <para>\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term></term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"               </para>\n"
-"\t    </listitem>\n"
-"\t    </varlistentry>\n"
-"\t  </variablelist>\n"
-"\n"
-"        </para>\n"
-
-#: tmp/preface.sgml.h:53
-msgid "        <title>Calendar</title>\n"
-msgstr "        <title>Calendario</title>\n"
-
-#: tmp/preface.sgml.h:55
-msgid "        <title>Contact Manager</title>\n"
-msgstr "        <title>Administrador de Contactos</title>\n"
-
-#: tmp/preface.sgml.h:57
-msgid "        <title>Typographical conventions</title>\n"
-msgstr "        <title>Convenios Tipográficos</title>\n"
-
-#: tmp/preface.sgml.h:59
-msgid ""
-"      <para>\n"
-"         Here are the keyboard shortcuts and menu items you're most\n"
-"         likely to use:\n"
-"         \n"
-"          <variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term>Create a new folder</term>\n"
-"\t    <listitem>`\n"
-"\t      <para>\n"
-"                <menuchoice><guimenu>File</guimenu><guisubmenu>New</"
-"guisubmenu>\n"
-"                <guimenuitem>Folder</guimenuitem></menuchoice> or\n"
-"                <keycombo action=\"simul\">\n"
-"\t\t  <keycap>Ctrl</keycap>\n"
-"\t\t  <keycap>Shift </keycap>\n"
-"\t\t  <keycap>F</keycap>\n"
-"                </keycombo>\n"
-"                </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term>Create a new Shortcut in the Evolution Bar</term>\n"
-"\t    <listitem>\n"
-"\t      <para>       \n"
-"                  <menuchoice><guimenu>File</guimenu>\n"
-"\t\t  <guisubmenu>New</guisubmenu>\n"
-"\t\t  <guimenuitem>Evolution Bar Shortcut</guimenuitem> </menuchoice> or \n"
-"                <keycombo action=\"simul\">\n"
-"\t\t  <keycap>Ctrl</keycap>\n"
-"\t\t  <keycap>Shift</keycap>\n"
-"\t\t  <keycap>S</keycap>\n"
-"                </keycombo>\n"
-"                </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term>Create a new email message:</term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"                Use\n"
-"                <menuchoice><guimenu>File</guimenu><guisubmenu>New</"
-"guisubmenu><guimenuitem>Mail\n"
-"                Message</guimenuitem>  </menuchoice> or \n"
-"                <keycombo action=\"simul\">\n"
-"\t\t  <keycap>Ctrl</keycap>\n"
-"\t\t  <keycap>Shift </keycap>\n"
-"\t\t  <keycap>M</keycap>\n"
-"                </keycombo>\n"
-"              </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term>Create a new Appointment</term>\n"
-"\t    <listitem>\n"
-"\t      <para>       \n"
-"                  <menuchoice><guimenu>File</guimenu>\n"
-"\t\t  <guisubmenu>New</guisubmenu>\n"
-"\t\t  <guimenuitem>Appointment</guimenuitem> </menuchoice>  or \n"
-"                <keycombo action=\"simul\">\n"
-"\t\t  <keycap>Ctrl</keycap>\n"
-"\t\t  <keycap>Shift</keycap>\n"
-"\t\t  <keycap>A</keycap>\n"
-"                </keycombo>\n"
-"                </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term>Enter a new Contact</term>\n"
-"\t    <listitem>\n"
-"\t      <para>       \n"
-"                  <menuchoice><guimenu>File</guimenu>\n"
-"\t\t  <guisubmenu>New</guisubmenu>\n"
-"\t\t  <guimenuitem>Contact</guimenuitem> </menuchoice>  or \n"
-"                <keycombo action=\"simul\">\n"
-"\t\t  <keycap>Ctrl</keycap>\n"
-"\t\t  <keycap>Shift</keycap>\n"
-"\t\t  <keycap>C</keycap>\n"
-"                </keycombo>\n"
-"                </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term>Create a new Task</term>\n"
-"\t    <listitem>\n"
-"\t      <para>       \n"
-"                  <menuchoice><guimenu>File</guimenu>\n"
-"\t\t  <guisubmenu>New</guisubmenu>\n"
-"\t\t  <guimenuitem>Task</guimenuitem>  </menuchoice> or \n"
-"                <keycombo action=\"simul\">\n"
-"\t\t  <keycap>Ctrl</keycap>\n"
-"\t\t  <keycap>Shift</keycap>\n"
-"\t\t  <keycap>T</keycap>\n"
-"                </keycombo>\n"
-"                </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t</variablelist>\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"         Aquí están los atajos de teclado y las opciones del menú que\n"
-"         probablemente sean las que mas use:\n"
-"         \n"
-"          <variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term>Crear una nueva carpeta</term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"                <menuchoice><guimenu>Archivo</guimenu><guisubmenu>Nuevo</"
-"guisubmenu>\n"
-"                <guimenuitem>Carpeta</guimenuitem></menuchoice> o\n"
-"                <keycombo action=\"simul\">\n"
-"\t\t  <keycap>Ctrl</keycap>\n"
-"\t\t  <keycap>Shift </keycap>\n"
-"\t\t  <keycap>C</keycap>\n"
-"                </keycombo>\n"
-"                </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term>Crear un nuevo Atajo en la Barra de Evolution</term>\n"
-"\t    <listitem>\n"
-"\t      <para>       \n"
-"                  <menuchoice><guimenu>Archivo</guimenu>\n"
-"\t\t  <guisubmenu>Nuevo</guisubmenu>\n"
-"\t\t  <guimenuitem>Atajo de Evolution</guimenuitem> </menuchoice> o \n"
-"                <keycombo action=\"simul\">\n"
-"\t\t  <keycap>Ctrl</keycap>\n"
-"\t\t  <keycap>Shift</keycap>\n"
-"\t\t  <keycap>A</keycap>\n"
-"                </keycombo>\n"
-"                </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term>Crear un nuevo mensaje de correo:</term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"                Use\n"
-"                <menuchoice><guimenu>Archivo</guimenu><guisubmenu>Nuevo</"
-"guisubmenu><guimenuitem>Mensaje de \n"
-"                Correo</guimenuitem>  </menuchoice> o \n"
-"                <keycombo action=\"simul\">\n"
-"\t\t  <keycap>Ctrl</keycap>\n"
-"\t\t  <keycap>Shift </keycap>\n"
-"\t\t  <keycap>M</keycap>\n"
-"                </keycombo>\n"
-"              </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term>Crear una nueva Cita</term>\n"
-"\t    <listitem>\n"
-"\t      <para>       \n"
-"                  <menuchoice><guimenu>Archivo</guimenu>\n"
-"\t\t  <guisubmenu>Nuevo</guisubmenu>\n"
-"\t\t  <guimenuitem>Cita</guimenuitem> </menuchoice>  o \n"
-"                <keycombo action=\"simul\">\n"
-"\t\t  <keycap>Ctrl</keycap>\n"
-"\t\t  <keycap>Shift</keycap>\n"
-"\t\t  <keycap>T</keycap>\n"
-"                </keycombo>\n"
-"                </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term>Introducir un nuevo Contacto</term>\n"
-"\t    <listitem>\n"
-"\t      <para>       \n"
-"                  <menuchoice><guimenu>Archivo</guimenu>\n"
-"\t\t  <guisubmenu>Nuevo</guisubmenu>\n"
-"\t\t  <guimenuitem>Contacto</guimenuitem> </menuchoice>  o \n"
-"                <keycombo action=\"simul\">\n"
-"\t\t  <keycap>Ctrl</keycap>\n"
-"\t\t  <keycap>Shift</keycap>\n"
-"\t\t  <keycap>C</keycap>\n"
-"                </keycombo>\n"
-"                </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term>Crear una nueva Tarea</term>\n"
-"\t    <listitem>\n"
-"\t      <para>       \n"
-"                  <menuchoice><guimenu>Archivo</guimenu>\n"
-"\t\t  <guisubmenu>Nuevo</guisubmenu>\n"
-"\t\t  <guimenuitem>Tarea</guimenuitem>  </menuchoice> o \n"
-"                <keycombo action=\"simul\">\n"
-"\t\t  <keycap>Ctrl</keycap>\n"
-"\t\t  <keycap>Shift</keycap>\n"
-"\t\t  <keycap>T</keycap>\n"
-"                </keycombo>\n"
-"                </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t</variablelist>\n"
-"      </para>\n"
-
-#: tmp/preface.sgml.h:165
-msgid ""
-"      <para>\n"
-"        <application>Evolution</application> can help you work in a\n"
-"        group by handling email, address and other contact\n"
-"        information, and one or more calendars.  It can do that on one\n"
-"        or several computers, connected directly or over a network,\n"
-"        for one person or for large groups.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        <application>Evolution</application> le puede ayudar a trabajar en\n"
-"        grupo encargandose del correo, direcciones y otra información\n"
-"        de contacto, y uno o más calendarios.  Puede hacerlo en uno o "
-"varios\n"
-"        ordenadores, conectados directamente o a traves de una red, para "
-"una\n"
-"        persona o para grandes grupos.\n"
-"      </para>\n"
-
-#: tmp/preface.sgml.h:173
-msgid ""
-"      <para>\n"
-"        <application>Evolution</application> is designed to make most\n"
-"        daily tasks faster.  For example, it takes only one or two\n"
-"        clicks to enter an appointment or an address card sent to you\n"
-"        by email, or to send email to a contact or appointment.\n"
-"        <application>Evolution</application> makes displays faster and\n"
-"        more efficient, so searches are faster and memory usage is\n"
-"        lower.  People who get lots of mail will appreciate advanced\n"
-"        features like <link\n"
-"        linkend=\"usage-mail-organize-vFolders\">Virtual Folders</link>,\n"
-"        which let you save searches as though they were ordinary mail\n"
-"        folders.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        <application>Evolution</application> está diseñada para hacer la\n"
-"        mayoría de las tareas diarias más rápido.  Por ejemplo, solo\n"
-"        requiere una o dos pulsaciones introducir una nueva cita o una\n"
-"        tarjeta que le hayan enviado por correo, o enviar un correo a un\n"
-"        contacto o a una cita.  <application>Evolution</application>\n"
-"        hace las vistas más rápidas y eficientes, para que las búsquedas\n"
-"        sean más rápidas y el uso de la memoria sea menor.  Las personas\n"
-"        que reciben mucho correo apreciarán las características avanzadas\n"
-"        como las <link\n"
-"        linkend=\"usage-mail-organize-vFolders\">Carpetas Virtuales</link>,\n"
-"        que le permiten guardar búsquedas como si fueran carpetas de correo\n"
-"        normales.\n"
-"      </para>\n"
-
-#: tmp/preface.sgml.h:187
-msgid ""
-"      <para>\n"
-"        <note>\n"
-"           <title>This is a preview release</title>\n"
-"           <para>\n"
-"             <application>Evolution</application> is not complete, and\n"
-"             still has a lot of flaws.  Please help improve it by\n"
-"             letting us know about them.  You should do this by\n"
-"             submitting bug reports with the GNOME <application>Bug\n"
-"             Report Tool</application> (known as\n"
-"             <command>bug-buddy</command> at the command line).\n"
-"          </para>\n"
-"        </note>\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        <note>\n"
-"           <title>Esta es una liberación de prueba</title>\n"
-"           <para>\n"
-"             <application>Evolution</application> no esta completa, y\n"
-"             todavía tiene muchos fallos.  Por favor ayúdenos a mejorarla\n"
-"             informandonos acerca de ellos.  Debe hacerlo enviando reportes\n"
-"             de fallo con la <application>Herramienta de Reportes de\n"
-"             Fallo</application> de GNOME (conocida como\n"
-"             <command>bug-buddy</command> en la línea de comandos).\n"
-"          </para>\n"
-"        </note>\n"
-"      </para>\n"
-
-#: tmp/preface.sgml.h:201
-msgid ""
-"      <para>\n"
-"        Because it's part of the GNOME project,\n"
-"        <application>Evolution</application> is Free Software.  The\n"
-"        program and its source code are released under the terms of\n"
-"        the GNU <ulink type=\"help\" url=\"gnome-help:gpl"
-"\"><citetitle>General\n"
-"        Public License (GPL)</citetitle></ulink>, and the\n"
-"        documentation falls under the <ulink type=\"help\"\n"
-"        url=\"gnome-help:fdl\"><citetitle>Free Documentation\n"
-"        License</citetitle></ulink> (FDL). For more information about\n"
-"        the GPL and the FDL, visit the Free Software Foundation's\n"
-"        website at <ulink\n"
-"        url=\"http://www.fsf.org\">http://www.fsf.org</ulink>.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        Como parte de proyecto GNOME,\n"
-"        <application>Evolution</application> is Software Libre.  El\n"
-"        programa y su código fuente están liberados bajo los términos de\n"
-"        la <ulink type=\"help\" url=\"gnome-help:gpl\"><citetitle>General "
-"Public License \"Licencia Pública\n"
-"        General\" (GPL)</citetitle></ulink> de GNU, y la\n"
-"        documentación está bajo la <ulink type=\"help\"\n"
-"        url=\"gnome-help:fdl\"><citetitle>Free Documentation\n"
-"        License \"Licencia Libre de Documentación\"</citetitle></ulink>\n"
-"        (FDL). Para más información acerca de la GPL y de la FDL,\n"
-"        visite el sitio web de la Free Software Foundation \"Fundación para\n"
-"        el Software Libre\" en <ulink\n"
-"        url=\"http://www.fsf.org\">http://www.fsf.org</ulink>.\n"
-"      </para>\n"
-
-#: tmp/preface.sgml.h:215
-msgid ""
-"      <para>\n"
-"        Here are the most frequent email tasks, and shortcuts for\n"
-"        navigating your mailbox with the keyboard instead of the\n"
-"        mouse:\n"
-"         <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term>Check Mail</term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"                Click <guibutton>Get Mail</guibutton> in the\n"
-"                toolbar. There is no keyboard shortcut for this task,\n"
-"                but you can ask <application>Evolution</application>\n"
-"                to check for new mail periodically. To do so, FIXME.\n"
-"                </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"          <varlistentry>\n"
-"\t    <term>Reply to a Message</term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"                To reply to the sender of the message only:\n"
-"                click <guibutton>Reply</guibutton> in the\n"
-"                toolbar, or press\n"
-"                <keycombo action=\"simul\">\n"
-"\t\t  <keycap>Ctrl</keycap>\n"
-"\t\t  <keycap>R</keycap>\n"
-"                </keycombo>\n"
-"                </para>\n"
-"\t      <para>\n"
-"                To reply to the sender and all the other visible\n"
-"                recipients of the message, click <guibutton>Reply to\n"
-"                All</guibutton> or select the message and press\n"
-"                <keycombo action=\"simul\">\n"
-"\t\t  <keycap>Shift</keycap>\n"
-"\t\t  <keycap>Ctrl</keycap>\n"
-"\t\t  <keycap>R</keycap>\n"
-"                </keycombo>\n"
-"              </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t  \n"
-"          <varlistentry>\n"
-"\t    <term>Forward a Message</term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"                Select the message or messages you want to forward,\n"
-"                and click <guibutton>Forward</guibutton> in the\n"
-"                toolbar, or press\n"
-"                <keycombo action=\"simul\">\n"
-"\t\t  <keycap>Ctrl</keycap>\n"
-"\t\t  <keycap>J</keycap>\n"
-"                </keycombo>\n"
-"                </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"          <varlistentry>\n"
-"\t    <term>Open a Message in a New Window</term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"                Double-click the message you want to view, or select\n"
-"                it and press\n"
-"                <keycombo action=\"simul\">\n"
-"\t\t  <keycap>Ctrl</keycap>\n"
-"\t\t  <keycap>O</keycap>\n"
-"                </keycombo>\n"
-"                </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"          <varlistentry>\n"
-"\t    <term>Create Filters and Virtual Folders</term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"                You can create filters and Virtual Folders based on\n"
-"                specific message attributes from the message's\n"
-"                right-click menu.  Alternately, select a message, and\n"
-"                then choose <menuchoice> <guimenu>Settings</guimenu>\n"
-"                <guimenuitem>Mail Filters</guimenuitem> </menuchoice>\n"
-"                or <menuchoice> <guimenu>Settings</guimenu>\n"
-"                <guimenuitem>Virtual Folder Editor</guimenuitem>\n"
-"                </menuchoice>.  Filters are discussed in <xref\n"
-"                linkend=\"usage-mail-organize-filters\">, and Virtual\n"
-"                Folders in <xref\n"
-"                linkend=\"usage-mail-organize-vfolders\">.\n"
-"            </para>\n"
-"\t    </listitem>\n"
-"\t</varlistentry>\n"
-"\t</variablelist>\n"
-"\n"
-"        </para>\n"
-msgstr ""
-"      <para>\n"
-"        Aquí están las tareas más comunes con el correo, y los\n"
-"        atajos para manejarse por su buzón con el teclado en lugar\n"
-"        de con el ratón:\n"
-"         <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term>Comprobar Correo</term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"                Pulse <guibutton>Obtener</guibutton> en la barra de\n"
-"                herramientas. No hay atajo de taclado para esto,\n"
-"                pero puede pedir a <application>Evolution</application>\n"
-"                que obtenga los nuevos mensajes periodicamente. Para\n"
-"                hacerlo, FIXME.\n"
-"                </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"          <varlistentry>\n"
-"\t    <term>Responder a un Mensaje</term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"                Para responder al remitente de un mensaje tan solo debe:\n"
-"                pulsar <guibutton>Responder</guibutton> en la barra de\n"
-"                herramientas, o pulsar\n"
-"                <keycombo action=\"simul\">\n"
-"\t\t  <keycap>Ctrl</keycap>\n"
-"\t\t  <keycap>R</keycap>\n"
-"                </keycombo>\n"
-"                </para>\n"
-"\t      <para>\n"
-"                Para responder al remitente y a todos los destinatarios\n"
-"                visibles del mensaje, pulse <guibutton>Responder a\n"
-"                Todos</guibutton> o seleccione el mensaje y pulse\n"
-"                <keycombo action=\"simul\">\n"
-"\t\t  <keycap>Shift</keycap>\n"
-"\t\t  <keycap>Ctrl</keycap>\n"
-"\t\t  <keycap>R</keycap>\n"
-"                </keycombo>\n"
-"              </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t  \n"
-"          <varlistentry>\n"
-"\t    <term>Reenviar un Mensaje</term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"                Sleccione el mensaje o mensajes que quiere reenviar,\n"
-"                y pulse <guibutton>Reenviar</guibutton> en la barra de\n"
-"                herramientas, o pulse\n"
-"                <keycombo action=\"simul\">\n"
-"\t\t  <keycap>Ctrl</keycap>\n"
-"\t\t  <keycap>J</keycap>\n"
-"                </keycombo>\n"
-"                </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"          <varlistentry>\n"
-"\t    <term>Abrir un Mensaje en una Nueva Ventana</term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"                Pulse dos veces sobre el mensaje que quiere ver, o\n"
-"                seleccionelo y pulse\n"
-"                <keycombo action=\"simul\">\n"
-"\t\t  <keycap>Ctrl</keycap>\n"
-"\t\t  <keycap>O</keycap>\n"
-"                </keycombo>\n"
-"                </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"          <varlistentry>\n"
-"\t    <term>Crear Filtros y Carpetas Virtuales</term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"                Puede crear filtros y carpetas virtuales basados en las\n"
-"                caracteristicas de un mensaje específico desde el menú que\n"
-"                aparece al pulsar el botón derecho del ratón.  \n"
-"                Alternativamente, seleccion un mensaje, y elija\n"
-"                <menuchoice><guimenu>Configuración</guimenu>\n"
-"                <guimenuitem>Filtros de Correo</guimenuitem> </menuchoice>\n"
-"                o <menuchoice> <guimenu>Configuración</guimenu>\n"
-"                <guimenuitem>Editor de Carpetas Virtuales</guimenuitem>\n"
-"                </menuchoice>.  Los filtros se discuten en <xref\n"
-"                linkend=\"usage-mail-organize-filters\">, y las carpetas\n"
-"                virtuales en <xref\n"
-"                linkend=\"usage-mail-organize-vfolders\">.\n"
-"            </para>\n"
-"\t    </listitem>\n"
-"\t</varlistentry>\n"
-"\t</variablelist>\n"
-"\n"
-"        </para>\n"
-
-#: tmp/preface.sgml.h:308
-msgid ""
-"      <para>\n"
-"        Information is useless unless it's organized and accessible;\n"
-"        it's hardly even worth the name if you can't look at it and be\n"
-"        <emphasis>informed</emphasis>.\n"
-"        <application>Evolution</application>'s goal is to make the\n"
-"        tasks of storing, organizing, and retrieving your personal\n"
-"        information easier, so you can work and communicate with\n"
-"        others.  That is, it's a highly evolved <glossterm\n"
-"        linkend=\"groupware\">groupware</glossterm> program, an integral\n"
-"        part of the Internet-connected desktop. On the inside, it's a\n"
-"        powerful database; on the outside, it's a tool to help you get\n"
-"        your work done.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"       La información no sirve a menos que este organizada y sea accesible.\n"
-"       Ni si quiera se merece ese nombre si no puede mirarla y estar\n"
-"       <emphasis>informado</emphasis>.\n"
-"       El objetivo de <application>Evolution</application> es hacer que las\n"
-"       tareas de guardar, organizar, y obtener su información personal sean\n"
-"       más fáciles, para que pueda trabajar y comunicarse con otros. Esto\n"
-"       es, programa de <glossterm\n"
-"       linkend=\"groupware\">trabajo en grupo</glossterm> altamente\n"
-"       evolucionado, una parte integral del escritorio conectado a "
-"Internet.\n"
-"       Por dentro, es una potente base de datos. Por fuera, es una\n"
-"       herramienta para ayudarle ha hacer su trabajo.\n"
-"      </para>\n"
-
-#: tmp/preface.sgml.h:322
-msgid ""
-"      <para>\n"
-"        The <application>Evolution</application> project has four\n"
-"        central goals:\n"
-"\n"
-"        <itemizedlist>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"             The application must be <emphasis>both powerful and easy\n"
-"             to use</emphasis>. In other words, it needs a familiar\n"
-"             and intuitive interface that users can customize to their\n"
-"             liking, and users should have access to shortcuts for\n"
-"             complex tasks.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"              <application>Evolution</application> must meet and\n"
-"              exceed the standards set by other groupware products.\n"
-"              It must include support for major network <glossterm\n"
-"              linkend=\"protocol\">protocols</glossterm> so that it can\n"
-"              integrate seamlessly with existing hardware and network\n"
-"              environments.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"               The project must support open standards and be open to\n"
-"               expansion, so that it can become a development platform\n"
-"               as well as an application.  From the simplest scripting\n"
-"               to the most complex network and component programming,\n"
-"               <application>Evolution</application> must offer\n"
-"               developers an environment for cutting-edge application\n"
-"               development.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"               Data must be safe: <application>Evolution</application>\n"
-"               must not lose mail, corrupt mailbox files or other\n"
-"               data, execute arbitrary <glossterm linkend=\"script"
-"\">scripts</glossterm>,\n"
-"               or delete files from your hard disk.\n"
-"            </para>\n"
-"          </listitem>\n"
-"\t</itemizedlist>\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        El proyecto de <application>Evolution</application> tiene cuatro\n"
-"        objetivos principales:\n"
-"\n"
-"        <itemizedlist>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"             La aplicación debe ser <emphasis>al mismo tiempo potente\n"
-"             y facil de usar</emphasis>. En otras palabras, necesita una\n"
-"             interfaz familiar e intuitiva que los usuarios puedan\n"
-"             personalizar a su gusto, y los usuarios deben tener acceso a\n"
-"             atajos para tareas complicadas.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"              <application>Evolution</application> debe cumplir y\n"
-"              sobrepasar los estandares impuestos por otros programas de\n"
-"              trabajo en grupo.  Debe tener soporte para la mayor parte de\n"
-"              los <glossterm linkend=\"protocol\">protocolos</glossterm>\n"
-"              de red para poder integrarse sin problemas con el hardware\n"
-"              y los entornos de red existentes.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"               El proyecto debe apoyar a los estandares abiertos y estar\n"
-"               abierto a la expansion, para que se pueda convertir en una\n"
-"               plataforma de desarollo tanto como en una aplicación.\n"
-"               Desde los guiones más simples a la programación de red y\n"
-"               componentes más compleja,\n"
-"               <application>Evolution</application> debe ofrecer a los\n"
-"               desarrolladores un entorno para el desarrollo de "
-"aplicaciones\n"
-"               de vanguardia.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"               Los datos deben ser seguros:\n"
-"               <application>Evolution</application> no debe perder correo,\n"
-"               corromper buzones u otra información, ejecutar\n"
-"               <glossterm linkend=\"script\">guiones</glossterm> de\n"
-"               instruciones arbitrarios o borrar archivos de su disco duro.\n"
-"            </para>\n"
-"          </listitem>\n"
-"\t</itemizedlist>\n"
-"      </para>\n"
-
-#: tmp/preface.sgml.h:368
-msgid ""
-"      <para>\n"
-"        This book is divided into two parts, with several\n"
-"        appendices. The first part is a <link linkend=\"usage\">guided\n"
-"        tour</link>&mdash; it will explain how to use\n"
-"        <application>Evolution</application>.  If you are new to\n"
-"        <application>Evolution</application> or to groupware in\n"
-"        general, this section is for you. The second section, covering\n"
-"        <link linkend=\"config\">configuration</link>, is targeted at\n"
-"        more advanced users, but anyone who wants to change the way\n"
-"        <application>Evolution</application> looks or acts can benefit\n"
-"        from reading it.  In addition, there is a comprehensive <link\n"
-"        linkend=\"menuref\">menu reference</link> which describes nearly\n"
-"        every capability that <application>Evolution</application> has\n"
-"        to offer.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        Thite libro está dividido en dos partes, con varios apendices.\n"
-"        La primera parte es una <link linkend=\"usage\">visita\n"
-"        guiada</link>&mdash; le explicará como usar\n"
-"        <application>Evolution</application>.  Si es nuevo en el uso de\n"
-"        <application>Evolution</application> o de los programas de trabajo\n"
-"        en grupo en general, esta sección es para usted. La segunda "
-"sección,\n"
-"        cubriendo la <link linkend=\"config\">configuración</link>, está\n"
-"        dirijida a usuarios más avanzados, pero cualquiera que quiera\n"
-"        cambiar el aspecto o el comportamiento de\n"
-"        <application>Evolution</application> se beneficiará de su lectura.\n"
-"        Ademas, hay una <link linkend=\"menuref\">referencia de menús</"
-"link>\n"
-"        que describe casi todas las posibilidades que ofrece\n"
-"        <application>Evolution</application>.\n"
-"      </para>\n"
-
-#: tmp/preface.sgml.h:384
-msgid ""
-"      <para>\n"
-"        This version of the <application>Evolution</application>\n"
-"        User's Guide is a <emphasis>draft</emphasis>. It describes\n"
-"        version 0.6 of the software.  It is missing huge\n"
-"        chunks of information, and many of the features it describes\n"
-"        are unimplemented.  All the content is subject to change,\n"
-"        especially if you help.  Please send comments on the guide to\n"
-"        <email>aaron@ximian.com</email>. If you would like to work\n"
-"        on the guide please contact me or see the GNOME Documentation\n"
-"        project <ulink\n"
-"        url=\"http://developer.gnome.org/projects/gdp\">web\n"
-"        site</ulink>.  This paragraph will be removed in later\n"
-"        versions of the manual.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        Esta versión de la Guía de Usuario de\n"
-"        <application>Evolution</application> es un\n"
-"        <emphasis>borrador</emphasis>. Describe la versión 0.6 del\n"
-"        programa.  Le faltan grandes piezas de información, y muchas de\n"
-"        las arecteristicas que describe no están implementadas.\n"
-"        Todo el contenido esta sujeto a cambios, especialmente si usted\n"
-"        colabora.  Por favor ebvie comentarios sobre la guía a\n"
-"        <email>aaron@ximian.com</email> y sobre la traducción a\n"
-"        <email>hector@scouts-es.org</email>. Si le gustaría colaborar en la\n"
-"        guía por favor pongase en contacto conmigo o vea el <ulink\n"
-"        url=\"http://developer.gnome.org/projects/gdp\">sitio\n"
-"        web</ulink> del proyecto de Documentación de GNOME.  Este párrafo\n"
-"        será eliminado en futuras versiones del manual.\n"
-"      </para>\n"
-
-#: tmp/preface.sgml.h:399
-msgid "      <title>About This Book</title>\n"
-msgstr "      <title>Acerca de este Libro</title>\n"
-
-#: tmp/preface.sgml.h:401
-msgid "      <title>Mail Tasks</title>\n"
-msgstr "      <title>Enviar Tareas por Correo</title>\n"
-
-#: tmp/preface.sgml.h:403
-msgid "      <title>Opening or Creating Anything</title>\n"
-msgstr "      <title>Abriendo o Creando algo</title>\n"
-
-#: tmp/preface.sgml.h:405
-msgid "      <title>What is Evolution, and What Can It Do for Me?</title>\n"
-msgstr "      <title>¿Qué es Evolution, y qué puede hacer por mi?</title>\n"
-
-#: tmp/preface.sgml.h:407
-msgid "    <!-- ************* END DRAFT ONLY PARAGRAPH ************** -->\n"
-msgstr "    <!-- ************* END DRAFT ONLY PARAGRAPH ************** -->\n"
-
-#: tmp/preface.sgml.h:409
-msgid ""
-"    <!-- ************** FOLLOWING PARAGRAPH FOR DRAFT ONLY ************* --"
-">\n"
-msgstr ""
-"    <!-- ************** FOLLOWING PARAGRAPH FOR DRAFT ONLY ************* --"
-">\n"
-
-#: tmp/preface.sgml.h:411
-msgid ""
-"    <para>\n"
-"        You might want to copy this section and tape it to\n"
-"        the wall next to your computer: it's a very short summary of\n"
-"        most of the things you'll want to do with\n"
-"        <application>Evolution</application>, and pointers to the\n"
-"        sections of the book where you'll find more in-depth\n"
-"        description of those tasks.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"        Puede que quiera copiar esta sección y pegarla a la pared de al "
-"lado\n"
-"        de su ordenador: es un resumen muy corto de la mayoría de las cosas\n"
-"        que querrá hacer con <application>Evolution</application>, y \n"
-"        referencias a las secciones del libro donde encontrará "
-"descripciones\n"
-"        más profundas de dichas tareas.\n"
-"    </para>\n"
-
-#: tmp/preface.sgml.h:420
-msgid "    <title>Introduction</title> \n"
-msgstr "    <title>Introducción</title> \n"
-
-#: tmp/preface.sgml.h:422
-msgid "    <title>Quick Reference for Common Tasks</title>\n"
-msgstr "    <title>Referencia Rápida para Tareas Comunes</title>\n"
-
-#: tmp/preface.sgml.h:424
-msgid ""
-"<!--\n"
-"<!DOCTYPE preface PUBLIC \"-//GNOME//DTD DocBook PNG Variant V1.1//EN\">\n"
-"-->\n"
-msgstr ""
-"<!--\n"
-"<!DOCTYPE preface PUBLIC \"-//GNOME//DTD DocBook PNG Variant V1.1//EN\">\n"
-"-->\n"
-
-#: tmp/preface.sgml.h:428
-msgid "<!-- =============Introduction ============================= -->\n"
-msgstr "<!-- =============Introduction ============================= -->\n"
diff --git a/help/es.po/usage-calendar.sgml.po b/help/es.po/usage-calendar.sgml.po
deleted file mode 100644
index 3654bd4910..0000000000
--- a/help/es.po/usage-calendar.sgml.po
+++ /dev/null
@@ -1,816 +0,0 @@
-# Translation into Spanish of Evolution docs.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Héctor García Álvarez <hector@scouts-es.org>, 2000.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution-docs\n"
-"POT-Creation-Date: 2001-04-20 13:43+0200\n"
-"PO-Revision-Date: 2000-12-28 15:38+0100\n"
-"Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: tmp/usage-calendar.sgml.h:1
-msgid ""
-"         <para>\n"
-"           If you create calendar events that overlap,\n"
-"           <application>Evolution</application> will display them side\n"
-"           by side in your calendar.  However,\n"
-"           <application>Evolution</application> cannot help you do\n"
-"           multiple things at once.\n"
-"         </para>\n"
-msgstr ""
-"         <para>\n"
-"           Si crea eventos de calendario que se superponen,\n"
-"           <application>Evolution</application> los mostrará uno al lado "
-"del\n"
-"           otro en su calendario.  Eso si,\n"
-"           <application>Evolution</application> no puede ayudarle ha hacer\n"
-"           varias cosas al mismo tiempo.\n"
-"         </para>\n"
-
-#: tmp/usage-calendar.sgml.h:9
-msgid ""
-"        <para>\n"
-"           If you don't need to enter more information than the date\n"
-"           and time of the appointment, you just click in any blank\n"
-"           space in the calendar and start typing. You can enter other\n"
-"           information later with the appointment editor.\n"
-"        </para>\n"
-msgstr ""
-"        <para>\n"
-"           Si no necesita poner más información que la fecha y la hora de\n"
-"           la cita, puede pichar simplemente en cualquier espacio en blanco\n"
-"           del calendario y comenzar a escribir. Puede incluir otra\n"
-"           información más tarde con el editor de citas.\n"
-"        </para>\n"
-
-#: tmp/usage-calendar.sgml.h:16
-msgid "        <title>Shortcut</title>\n"
-msgstr "        <title>Atajo</title>\n"
-
-#: tmp/usage-calendar.sgml.h:18
-msgid "       <title>Doing Two Things At Once</title>\n"
-msgstr "       <title>Haciendo Dos Cosas A La Vez</title>\n"
-
-#: tmp/usage-calendar.sgml.h:20
-msgid ""
-"      <para>\n"
-"\tOnce you're done with all those settings, click on the disk\n"
-"\ticon in the toolbar.  That will save the event and close the\n"
-"\tevent editor window. If you want, you can alter an event\n"
-"\tsummary in the calendar view by clicking on it and typing. You\n"
-"\tcan change other settings by right-clicking on the event then\n"
-"\tchoosing <guimenuitem>Edit this Appointment</guimenuitem>.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"\tUna vez que haya acabado con toda la configuración, pulse en el icono\n"
-"\tdel disco en la barra de herramientas.  Esto guardará el evento y cerrará\n"
-"\tla ventana de edición de eventos. Si quiere, puede alterar el resumen del\n"
-"\ten la vista del calendario pulsando sobre ela y escribiendo. Puede\n"
-"\tcambiar otros valores pulsando con el botón derecho del ratón sobre el\n"
-"\tevento y eligiendo <guimenuitem>Editar esta cita</guimenuitem>.\n"
-"      </para>\n"
-
-#: tmp/usage-calendar.sgml.h:29
-msgid ""
-"      <para>\n"
-"\tTo create a new calendar event, select\n"
-"        <menuchoice>\n"
-"\t  <guimenu>File</guimenu>\n"
-"\t  <guisubmenu>New</guisubmenu> \n"
-"\t  <guimenuitem>Appointment</guimenuitem>\n"
-"\t</menuchoice>\n"
-"\tor click the <guibutton>New</guibutton> button on the left end\n"
-"\tof the toolbar. The <interface>New Appointment</interface>\n"
-"\tdialog will pop up with the usual menu bar, tool bar, and\n"
-"\twindow full of choices for you.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"\tPara crear un nuevo evento de calendario, seleccione\n"
-"        <menuchoice>\n"
-"\t  <guimenu>Archivo</guimenu>\n"
-"\t  <guisubmenu>Nuevo</guisubmenu> \n"
-"\t  <guimenuitem>Cita</guimenuitem>\n"
-"\t</menuchoice>\n"
-"\to pulse el botón <guibutton>Nuevo</guibutton> a la izquierda de la barra\n"
-"\tde herramientas. El diálogo de <interface>Nueva Cita</interface>\n"
-"\taparecerá con la habitual barra de menú, barra de herramientas, y ventana\n"
-"\tllenas de opciones.\n"
-"      </para>\n"
-
-#: tmp/usage-calendar.sgml.h:42
-msgid ""
-"      <para>\n"
-"         <guilabel>Classification</guilabel> is a little more\n"
-"         complicated, and only applies to calendars on a\n"
-"         network. <guilabel>Public</guilabel> is the default category,\n"
-"         and a public event can be viewed by anyone on the calendar\n"
-"         sharing network.  <guilabel>Private</guilabel> denotes one\n"
-"         level of security, and <guilabel>Confidential</guilabel> a\n"
-"         higher level.  <!-- FIXME --> Exact determinations and\n"
-"         implementations of this feature have yet to be\n"
-"         determined. <!-- FIXME -->\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"         <guilabel>Clasificación</guilabel> es un poco más complicado,\n"
-"         y solo afecta a los calendarios en red.\n"
-"         <guilabel>Público</guilabel> es la categoría por defecto,\n"
-"         y un evento público puede ser visto por cualquiera en la red de\n"
-"         conpartición del calendario.  <guilabel>Privado</guilabel> indica\n"
-"         un nivel de seguridad, y <guilabel>Confidencial</guilabel> un\n"
-"         nivel mayor.  <!-- FIXME --> El significado y la implementecion "
-"de          estas caracteristicas\n"
-"         todavia no se han determinado. <!-- FIXME -->\n"
-"      </para>\n"
-
-#: tmp/usage-calendar.sgml.h:54
-msgid ""
-"      <para>\n"
-"         You can have as many as four different\n"
-"         <guilabel>Alarms</guilabel>, any time prior to the event\n"
-"         you've scheduled.  You can have one alarm of each type:\n"
-"         <variablelist>\n"
-"           <varlistentry>\n"
-"\t    <term><guilabel>Display</guilabel></term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t        A window will pop up on your screen to remind you of\n"
-"\t        your event.\n"
-"              </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t  <varlistentry> \n"
-"\t    <term><guilabel>Audio</guilabel></term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t        Choose this to have your computer deliver a sound\n"
-"\t        alarm.\n"
-"              </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Program</guilabel></term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t        Select this if you would like to run a program as a\n"
-"\t        reminder.  You can enter its name in the text field,\n"
-"\t        or find it with the <guibutton>Browse</guibutton>\n"
-"\t        button.\n"
-"              </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Mail</guilabel></term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t         <application>Evolution</application> will send an\n"
-"\t         email reminder to the address you enter into the text\n"
-"\t         field.\n"
-"              </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"\t    \n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"         Puede tener hasta cuatro <guilabel>Alarmas</guilabel>\n"
-"         distintas, para cualquier momento antes de la hora que ha fijado\n"
-"         para el evento.  Puede tener una alarma de cada tipo:\n"
-"         <variablelist>\n"
-"           <varlistentry>\n"
-"\t    <term><guilabel>Mostrar</guilabel></term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t        Aparecerá una ventana en la pantalla para recordarle el evento.\n"
-"              </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t  <varlistentry> \n"
-"\t    <term><guilabel>Auditiva</guilabel></term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t        Eliga esta opción para que el ordenador emita una alarma\n"
-"\t        auditiva.\n"
-"              </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Programa</guilabel></term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t        Seleccione esto si quiere que alguna aplicación adicional se\n"
-"\t        ejecute como recordatorio.  Puede escribir su nombre en el campo\n"
-"\t        de texto, o buscarla con el botón\n"
-"\t        <guibutton>Buscar</guibutton>.\n"
-"              </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Correo</guilabel></term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t        <application>Evolution</application> enviará un mensaje\n"
-"\t        recordatorio a la dirección que haya escrito en el campo de\n"
-"\t        texto.\n"
-"             </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"\t    \n"
-"      </para>\n"
-
-#: tmp/usage-calendar.sgml.h:102
-msgid ""
-"      <para>\n"
-"        Keelyn, the office manager for a small company, has one\n"
-"        calendar for her own schedule.  On the local network, she\n"
-"        maintains one for the conference room, so people know when\n"
-"        they can schedule meetings.  Next to that, she maintains a\n"
-"        calendar that reflects when consultants are going to be on\n"
-"        site, and another that keeps track of when the Red Sox are\n"
-"        playing.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        Keelyn, la encargada de oficina de una pequeña compañía, tiene\n"
-"        un calendario para su propio horario.  En la red local, mantiene\n"
-"        uno para la sala de reuniones, para que la gente sepa cuando pueden\n"
-"        concertar citas.  Ademas de eso, mantiene un calendario que refleja\n"
-"        cuando van a estar disponibles los consultores, y otro donde\n"
-"        sigue los días en los que juegan los Red Sox.\n"
-"      </para>\n"
-
-#: tmp/usage-calendar.sgml.h:112
-msgid ""
-"      <para>\n"
-"        The <guilabel>Recurrence</guilabel> tab lets you describe\n"
-"        repetition in events ranging from once every day up to once\n"
-"        every 100 years.  You can then choose a time and date when the\n"
-"        event will stop recurring, and, under\n"
-"        <guilabel>Exceptions</guilabel>, pick individual days when the\n"
-"        event will <emphasis>not</emphasis> recur. Make your\n"
-"        selections from left to right, and you'll form a sentence:\n"
-"        \"Every two weeks on Monday and Friday until January 3, 2003\"\n"
-"        or \"Every month on the first Friday for 12 occurrences.\"\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        La pestaña <guilabel>Recurrencia</guilabel> le permite describir\n"
-"        repeticiones en eventos que van desde una vez cada día a una vez\n"
-"        cada 100 años.  Puede tambien elegir cuando cesarán las\n"
-"        repeticiones, y, bajo <guilabel>Excepciones</guilabel>, elegir\n"
-"        días individuales en los que el evento <emphasis>no</emphasis> se\n"
-"        realizará. Haga sus selecciones de izquierda a derecha, y formará\n"
-"        una frase: \"Cada dos semanas los lunes y los viernes hasta el 3 de\n"
-"        enero de 2003\" o \"Cada mes el primer viernes durante 12\n"
-"        ocurrencias\".\n"
-"      </para>\n"
-
-#: tmp/usage-calendar.sgml.h:124
-msgid ""
-"      <para>\n"
-"        Your event must have a starting and ending date &mdash; by\n"
-"        default, today &mdash; but you can choose whether to give it\n"
-"        starting and ending times or to mark it as an <guilabel>All\n"
-"        day event</guilabel>. An <guilabel>All day event</guilabel>\n"
-"        appears at the top of a day's event list rather than inside\n"
-"        it.  That makes it easy to have events that overlap and fit\n"
-"        inside each other.  For example, a conference might be an all\n"
-"        day event, and the meetings at the conference would be timed\n"
-"        events.  Of course, events with specific starting and ending\n"
-"        times can also overlap.  When they do they're displayed as\n"
-"        multiple columns in the day view of the calendar.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        Su evento debe tener una fecha de inicio y de fin &mdash; por\n"
-"        defecto, hoy &mdash; pero puede elegir entre darle una hora de\n"
-"        inicio y de fin o marcarlo como un <guilabel>Evento de todo\n"
-"        el día</guilabel>. Un <guilabel>Evento de todo el día</guilabel>\n"
-"        aparece arriba en una lista de eventos diarios en lugar de dentro\n"
-"        del día.  Eso hace que sea más facil tener eventos que se solapen y\n"
-"        que esten unos dentro de otros.  Por ejemplo, una conferencia puede\n"
-"        ser un evento de todo el día, y los encuentros en la conferencia\n"
-"        serian eventos parciales.  Naturalmente, los eventos con horarios\n"
-"        específicos de inicio y fin tambien pueden solaparse.  Cuenado lo\n"
-"        hacen son mostrados como multiples columnas en la vista diaria del\n"
-"        calendario.\n"
-"      </para>\n"
-
-#: tmp/usage-calendar.sgml.h:138
-msgid "      <title>Creating events</title>\n"
-msgstr "      <title>Creando eventos</title>\n"
-
-#: tmp/usage-calendar.sgml.h:140
-msgid "      <title>Keeping Multiple Calendars</title>\n"
-msgstr "      <title>Manteniendo Múltiples Calendarios</title>\n"
-
-#: tmp/usage-calendar.sgml.h:142
-msgid ""
-"    <para>\n"
-"       <application>Evolution</application> permits you to have and\n"
-"       maintain multiple calendars.  This is useful if you maintain\n"
-"       schedules for other people, if you are responsible for resource\n"
-"       or room allocation, or if you have multiple personalities.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"       <application>Evolution</application> le permite tener y mantener\n"
-"       múltiples calendarios.  Esto es útil si mantiene horarios para otras\n"
-"       personas, si es el responsable de la búsqueda de recursos o\n"
-"       habitaciones, o si tiene múltiples personalidades.\n"
-"    </para>\n"
-
-#: tmp/usage-calendar.sgml.h:149
-msgid ""
-"    <para>\n"
-"       Once you've added a task to your to-do list, its summary\n"
-"       appears in the <guilabel>Summary</guilabel> section of task\n"
-"       list.  To view or edit a detailed description of an item,\n"
-"       double-click on it, or select it and click\n"
-"       <guibutton>Edit</guibutton>.  You can delete items by selecting\n"
-"       them and clicking on the <guibutton>Delete</guibutton> button.\n"
-"    </para>\n"
-msgstr ""
-"   <para>\n"
-"     Una vez que ha añadido una tarea a su lista \"por hacer\", su resumen\n"
-"     aparece en la sección <guilabel>Resumen</guilabel> de la lista de\n"
-"     tareas. Para ver o editar una descripción detallada en un\n"
-"     elemento, pulse dos veces sobre el, o seleccionelo y pulse\n"
-"     <guibutton>Editar</guibutton>.  Puede borrar un elemento\n"
-"     seleccionandolo y pulsandolo en el botón <guibutton>Borrar</"
-"guibutton>.\n"
-"   </para>\n"
-
-#: tmp/usage-calendar.sgml.h:158
-msgid ""
-"    <para>\n"
-"       The <guibutton>Prev</guibutton> and <guibutton>Next</guibutton>\n"
-"       buttons will move you forward and back in your calendar pages.\n"
-"       If you're looking at only one day, you'll see tomorrow's page,\n"
-"       or yesterday's.  If you're looking at your calendar by week,\n"
-"       month, fortnight, or anything else, you'll move around by just\n"
-"       that much. To come back to today's listing, click\n"
-"       <guibutton>Today</guibutton>.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"       Los botones <guibutton>Previo</guibutton> y <guibutton>\n"
-"       Siguiente</guibutton> le moverán hacia alante y hacia atrás en las\n"
-"       páginas de su calendario.  Si está viendo solo a un día, verá la\n"
-"       página de mañana o la de ayer.  Si esta viendo su calendario por\n"
-"       semanas, meses, quincenas, o cualquier otra cosa, se movera esa\n"
-"       cantidad de tiempo. Para volver al día de hoy, pulse\n"
-"       <guibutton>Hoy</guibutton>.\n"
-"    </para>\n"
-
-#: tmp/usage-calendar.sgml.h:168
-msgid ""
-"    <para>\n"
-"       The Task Pad, located in the lower right corner of the\n"
-"       calendar, lets you keep a list of tasks separate from your\n"
-"       calendar events.  Tasks are colored and sorted by priority and\n"
-"       due-date (see <xref linkend=\"config-prefs\"> for more\n"
-"       information), and are included with calendar data during\n"
-"       synchronization with a hand-held device.  You can use the list\n"
-"       in a larger format by choosing the <guibutton>Tasks</guibutton>\n"
-"       button in the shortcut bar or in the folder tree.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"       La lista de tareas, situada en la esquina inferior derecha del\n"
-"       calendario, le permite mantener una lista de tareas separada de sus\n"
-"       eventos de calendario.  Las tareas son coloreadas y ordenadas por\n"
-"       prioridad y fecha de vencimiento (vea <xref linkend=\"config-prefs"
-"\">\n"
-"       para más inforación), y son incluidas con la información del\n"
-"       calendario cuando se sincroniza con dispositivo de mano.  Puede usar\n"
-"       la lista en un formato más grande eligiendo el botón\n"
-"       <guibutton>Tareas</guibutton> de la barra de atajos o del arbol de\n"
-"       carpetas.\n"
-"    </para>\n"
-
-#: tmp/usage-calendar.sgml.h:179
-msgid ""
-"    <para>\n"
-"       The toolbar offers you four different views of your calendar:\n"
-"       one day, five days, a week, or a month at once. Press the\n"
-"       calendar-shaped buttons on the right side of the toolbar to\n"
-"       switch between views. You can also select a range of\n"
-"       days&mdash; three days, ten days, a fortnight if you want\n"
-"       &mdash; in the small calendar at the upper right.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"      La barra de herramientas le ofrece cuatro vistas distintas de su\n"
-"      calendario: un día, cinco días, una semana, o un mes. Pulse sobre\n"
-"      los botones con forma de calendario a la derecha de la barra de\n"
-"      herramientas para alternar entre las distintas vistas. Tambien puede\n"
-"      seleccionar un rango de días&mdash; tres días, diez días, quinzenas\n"
-"      si quiere&mdash; en el pequeño calendario en la esquina superior\n"
-"      derecha.\n"
-"    </para>\n"
-
-#: tmp/usage-calendar.sgml.h:188
-msgid ""
-"    <para>\n"
-"       To record a new task, click the <guibutton>Add</guibutton>\n"
-"       button below the list.  <application>Evolution</application>\n"
-"       will pop up a small window with five items in it:\n"
-"     \n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t  <term> <guilabel>Summary:</guilabel></term>\n"
-"\t  <listitem>\n"
-"            <para>\n"
-"              The description you enter here will appear in the To Do\n"
-"              list itself.\n"
-"          </para>\n"
-"\t  </listitem>\n"
-"\t  </varlistentry>\n"
-"\t\n"
-"\t<varlistentry>\n"
-"\t  <term> <guilabel>Due Date:</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"            Decide when this item is\n"
-"            due.  You can either type in a date and time, or select one "
-"from\n"
-"            the <guibutton>Calendar</guibutton> and time drop-down menus.\n"
-"          </para>\n"
-"\t  </listitem>\n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"\t  <term><guilabel>Priority:</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"             Select a level of importance from 1 (most important) to 9\n"
-"              (least important).\n"
-"            </para>\n"
-"\t  </listitem> \n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"\t  <term> <guilabel>Item Comments:</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"              If you wish, you can keep a more detailed description of\n"
-"              the item here.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"\t</varlistentry>\n"
-"      </variablelist>\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"       Para guardar una nueva tarea, pulse sobre el botón\n"
-"       <guibutton>Añadir</guibutton>.  <application>Evolution</application>\n"
-"       mostrará una pequeña ventana con cinco elementos en ella:\n"
-"     \n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t  <term> <guilabel>Resumen:</guilabel></term>\n"
-"\t  <listitem>\n"
-"            <para>\n"
-"              La descripción que escriba aquí aparecerá en la lista Por\n"
-"              Hacer.\n"
-"          </para>\n"
-"\t  </listitem>\n"
-"\t  </varlistentry>\n"
-"\t\n"
-"\t<varlistentry>\n"
-"\t  <term> <guilabel>Fecha de Plazo:</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"            Decida cuando vence el plazo para este elemnto.\n"
-"            Puede escribir una fecha y una hora, o seleccionar una del\n"
-"            <guibutton>Calendario</guibutton> y la hora de los menus "
-"desplegables.\n"
-"          </para>\n"
-"\t  </listitem>\n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"\t  <term><guilabel>Prioridad:</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"             Seleccione un nivel de importancia desde 1 (más importante) a "
-"9\n"
-"              (menos importante).\n"
-"            </para>\n"
-"\t  </listitem> \n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"\t  <term> <guilabel>Comentarios sobre el elemento:</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"              Si lo desea, puede escribir aquí una descripción más "
-"detallada\n"
-"              del elemento.\n"
-"            </para>\n"
-"\t  </listitem>\n"
-"\t</varlistentry>\n"
-"      </variablelist>\n"
-"    </para>\n"
-
-#: tmp/usage-calendar.sgml.h:235
-msgid ""
-"    <para>\n"
-"       To visit a specific date's calendar entries, click\n"
-"       <guibutton>Go To</guibutton> and select the date in the dialog\n"
-"       box that appears.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"       Para ver una fecha espefica del calendario, pulse\n"
-"       <guibutton>Ir A</guibutton> y seleccione la fecha en la ventana\n"
-"       de diálogo que aparece.\n"
-"    </para>\n"
-
-#: tmp/usage-calendar.sgml.h:241
-msgid ""
-"    <para>\n"
-"      Of course, you'll want to use the calendar to do more than find\n"
-"      out what day it is. This section will tell you how to schedule\n"
-"      events, set alarms, and determine event recurrence.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"      Naturalmente, querra usar el calendario para hacer algo más que\n"
-"      saber que día es. Esta sección le contará como fijar eventos, poner\n"
-"      alarmas, y especificar recurrencias en los eventos.\n"
-"    </para>\n"
-
-#: tmp/usage-calendar.sgml.h:247
-msgid ""
-"    <para>\n"
-"      To create a new calendar, select \n"
-"      <menuchoice>\n"
-"\t<guimenu>File</guimenu> <guisubmenu>New</guisubmenu>\n"
-"\t<guimenuitem>Calendar</guimenuitem>\n"
-"      </menuchoice>.\n"
-"       You can place the calendar in any calendar folder and access it\n"
-"       from the folder view.  Alarms, configuration, and display for\n"
-"       each calendar are separate from each other.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"      Para crear un nuevo calendario, seleccione\n"
-"      <menuchoice>\n"
-"\t<guimenu>Archivo</guimenu> <guisubmenu>Nuevo</guisubmenu>\n"
-"\t<guimenuitem>Calendario</guimenuitem>\n"
-"      </menuchoice>.\n"
-"       Puede colocar el calendario en cualquier carpeta de calendario y\n"
-"       acceder a el desde la vista de carpetas.  Las alarmas, la\n"
-"       configuración, y las vistas de cada calendario se mantienen "
-"separadas\n"
-"       unas de otras.\n"
-"    </para>\n"
-
-#: tmp/usage-calendar.sgml.h:258
-msgid "    <title>Multiple Calendars</title>\n"
-msgstr "    <title>Múltiples Calendarios</title>\n"
-
-#: tmp/usage-calendar.sgml.h:260
-msgid "    <title>Scheduling With the Evolution Calendar</title>\n"
-msgstr "    <title>Programando Citas con el Calendario de Evolution</title>\n"
-
-#: tmp/usage-calendar.sgml.h:262
-msgid "    <title>Ways of Looking at your Calendar</title>\n"
-msgstr "    <title>Maneras de ver su calendario</title>\n"
-
-#: tmp/usage-calendar.sgml.h:264
-msgid "   <title>The Task Pad</title>\n"
-msgstr "   <title>La lista de tareas</title>\n"
-
-#: tmp/usage-calendar.sgml.h:266
-msgid ""
-"  <para>\n"
-"    To begin using the calendar, select\n"
-"    <guibutton>Calendar</guibutton> from the <interface>shortcut\n"
-"    bar</interface>.  By default, the calendar starts showing today's\n"
-"    schedule on a ruled background.  At the upper right, there's a\n"
-"    monthly calendar you can use to switch days.  Below that, there's\n"
-"    a <guilabel>TaskPad</guilabel>, where you can keep a list of tasks\n"
-"    seperate from your calendar appointments.  The calendar's daily\n"
-"    view is shown in <xref linkend=\"usage-calendar-fig\">.\n"
-"\n"
-"   <!-- ============== Figure ============================= -->\n"
-"    <figure id=\"usage-calendar-fig\">\n"
-"      <title>Evolution Calendar View</title>\n"
-"      <screenshot>\n"
-"\t<screeninfo>Evolution Contact Manager Window</screeninfo>\n"
-"\t<graphic fileref=\"fig/calendar\" format=\"png\" srccredit=\"Aaron Weber"
-"\">\n"
-"\t</graphic>\n"
-"      </screenshot>\n"
-"    </figure>\n"
-"  <!-- ============== End of Figure ============================= --> \n"
-"\n"
-"  </para>\n"
-msgstr ""
-"  <para>\n"
-"    Para comenzar a usar el calendario, seleccione\n"
-"    <guibutton>Calendario</guibutton> de la <interface>barra de\n"
-"    atajos</interface>.  Por defecto, el calendario empieza mostrando el\n"
-"    horario para hoy sobre un fondo reglado.  Arriba a la derecha, hay un\n"
-"    calendario mensual que puede usar para cambiar de día.  Debajo de eso,\n"
-"    hay una <guilabel>Lista de Tareas</guilabel>, donde puede tener una\n"
-"    lista de tareas separada de sus citas del calendario.  La vista diaria\n"
-"    del calendario se muestra en <xref linkend=\"usage-calendar-fig\">.\n"
-"\n"
-"   <!-- ============== Figure ============================= -->\n"
-"    <figure id=\"usage-calendar-fig\">\n"
-"      <title>Vista del Calendario de Evolution</title>\n"
-"      <screenshot>\n"
-"\t<screeninfo>Vista del Administrador de Contactos de Evolution</"
-"screeninfo>\n"
-"\t<graphic fileref=\"fig/calendar\" format=\"png\" srccredit=\"Aaron Weber"
-"\">\n"
-"\t</graphic>\n"
-"      </screenshot>\n"
-"    </figure>\n"
-"  <!-- ============== End of Figure ============================= --> \n"
-"\n"
-"  </para>\n"
-
-#: tmp/usage-calendar.sgml.h:289
-msgid "  <title>The Evolution Calendar</title>\n"
-msgstr "  <title>El calendario de Evolution</title>\n"
-
-#: tmp/usage-calendar.sgml.h:291
-msgid ""
-"<!--\n"
-"<!DOCTYPE Chapter PUBLIC \"-//GNOME//DTD DocBook PNG Variant V1.1//EN\">\n"
-"-->\n"
-msgstr ""
-"<!--\n"
-"<!DOCTYPE Chapter PUBLIC \"-//GNOME//DTD DocBook PNG Variant V1.1//EN\">\n"
-"-->\n"
-
-#: tmp/usage-calendar.sgml.h:295
-msgid ""
-"<!-- ############### FIXME FIXME FIXME ############\n"
-"Feature not yet implemented, and may not be implemented due to\n"
-"lack of time, resources, and interest.\n"
-"    <para>\n"
-"       In addition, <application>Evolution</application> supports\n"
-"       Hebrew, Muslim, and other calendar formats.  To switch to a\n"
-"       different calendar format, choose\n"
-"       <guimenuitem>GUIMENUITEM</guimenuitem> from the\n"
-"       <guimenu>GUIMENU</guimenu>.\n"
-"    </para>\n"
-"################  END FIXME AREA   ##################   -->\n"
-msgstr ""
-"<!-- ############### FIXME FIXME FIXME ############\n"
-"Caracteristica no implementada y que puede que no se implemente por falta\n"
-"de tiempo, recursos, e interes.\n"
-"    <para>\n"
-"       In addition, <application>Evolution</application> supports\n"
-"       Hebrew, Muslim, and other calendar formats.  To switch to a\n"
-"       different calendar format, choose\n"
-"       <guimenuitem>GUIMENUITEM</guimenuitem> from the\n"
-"       <guimenu>GUIMENU</guimenu>.\n"
-"    </para>\n"
-"################  END FIXME AREA   ##################   -->\n"
-
-#: tmp/usage-calendar.sgml.h:307
-msgid ""
-"<!-- ############UNIMPLEMENTED FEATURES ###################\n"
-"\n"
-"    <sect2 id=\"usage-calendar-apts-group\">\n"
-"      <title>Appointments for Groups</title>\n"
-"      <para>\n"
-"\tIf you have your calendar set up to work with other\n"
-"\tcalendars over a network, you can see when others are\n"
-"\tavailable to meet with you. \n"
-"      </para>\n"
-"      <note>\n"
-"\t<title>Unimplemented Feature</title>\n"
-"\t<para>This feature is not yet implemented.</para>\n"
-"      </note>\n"
-"\n"
-"      <para>\n"
-"\tIn addition, you can use <application>Evolution</application>\n"
-"\tto mark a meeting request on another person's calendar.  To do\n"
-"\tit, click <guibutton>New</guibutton> in the calendar toolbar,\n"
-"\tor select <menuchoice> <guimenu>File</guimenu>\n"
-"\t<guisubmenu>New</guisubmenu>\n"
-"\t<guimenuitem>Appointment</guimenuitem> </menuchoice> to bring\n"
-"\tup the <interface>new event</interface> window.  Then describe\n"
-"\tthe event as you would any other.  Before you click\n"
-"\t<guibutton>OK</guibutton>, (INSERT DESCRIPTION HERE...).\n"
-"\t<application>Evolution</application> will automatically send\n"
-"\temail to each person on the request list, notifying of the\n"
-"\ttime and date of the meeting you have requested with them.  In\n"
-"\taddition, it will mark the event on your calendar and on\n"
-"\ttheirs as tentative, rather than a confirmed, event.\n"
-"      </para>\n"
-"      <para>\n"
-"\tTo mark a tentative event as confirmed, click once on the\n"
-"\tevent in the <interface>calendar view</interface> to select\n"
-"\tit, and then choose <guimenuitem>Event\n"
-"\tProperties</guimenuitem> from the <guimenu>Settings</guimenu>\n"
-"\tmenu.  In the <interface>Event Properties</interface> dialog\n"
-"\twindow, click the \"tentative\" button to De-select the\n"
-"\tevent.\n"
-"      </para>\n"
-"    </sect2>\n"
-"\n"
-"\n"
-"    <sect2 id=\"usage-calendar-apts-privs\">\n"
-"      <title>Scheduling privileges</title>\n"
-"      <para>\n"
-"\tThere are several levels of scheduling privileges.  You\n"
-"\tcan set whether people can see your calendar, whether they\n"
-"\tcan request meetings or appointments, and whether they can\n"
-"\tcreate appointments.  This section may have to be deleted,\n"
-"\tbecause I don't know if we are going to support privileges\n"
-"\tat all.\n"
-"      </para>\n"
-"    </sect2>\n"
-" ########## END UNIMPLEMENTED FEATURESET ############ -->\n"
-msgstr ""
-"<!-- ############UNIMPLEMENTED FEATURES ###################\n"
-"  ################## NO LO VOY A TRADUCIR PORQUE NO SE MUESTRA ######\n"
-"\n"
-"    <sect2 id=\"usage-calendar-apts-group\">\n"
-"      <title>Appointments for Groups</title>\n"
-"      <para>\n"
-"\tIf you have your calendar set up to work with other\n"
-"\tcalendars over a network, you can see when others are\n"
-"\tavailable to meet with you. \n"
-"      </para>\n"
-"      <note>\n"
-"\t<title>Unimplemented Feature</title>\n"
-"\t<para>This feature is not yet implemented.</para>\n"
-"      </note>\n"
-"\n"
-"      <para>\n"
-"\tIn addition, you can use <application>Evolution</application>\n"
-"\tto mark a meeting request on another person's calendar.  To do\n"
-"\tit, click <guibutton>New</guibutton> in the calendar toolbar,\n"
-"\tor select <menuchoice> <guimenu>File</guimenu>\n"
-"\t<guisubmenu>New</guisubmenu>\n"
-"\t<guimenuitem>Appointment</guimenuitem> </menuchoice> to bring\n"
-"\tup the <interface>new event</interface> window.  Then describe\n"
-"\tthe event as you would any other.  Before you click\n"
-"\t<guibutton>OK</guibutton>, (INSERT DESCRIPTION HERE...).\n"
-"\t<application>Evolution</application> will automatically send\n"
-"\temail to each person on the request list, notifying of the\n"
-"\ttime and date of the meeting you have requested with them.  In\n"
-"\taddition, it will mark the event on your calendar and on\n"
-"\ttheirs as tentative, rather than a confirmed, event.\n"
-"      </para>\n"
-"      <para>\n"
-"\tTo mark a tentative event as confirmed, click once on the\n"
-"\tevent in the <interface>calendar view</interface> to select\n"
-"\tit, and then choose <guimenuitem>Event\n"
-"\tProperties</guimenuitem> from the <guimenu>Settings</guimenu>\n"
-"\tmenu.  In the <interface>Event Properties</interface> dialog\n"
-"\twindow, click the \"tentative\" button to De-select the\n"
-"\tevent.\n"
-"      </para>\n"
-"    </sect2>\n"
-"\n"
-"\n"
-"    <sect2 id=\"usage-calendar-apts-privs\">\n"
-"      <title>Scheduling privileges</title>\n"
-"      <para>\n"
-"\tThere are several levels of scheduling privileges.  You\n"
-"\tcan set whether people can see your calendar, whether they\n"
-"\tcan request meetings or appointments, and whether they can\n"
-"\tcreate appointments.  This section may have to be deleted,\n"
-"\tbecause I don't know if we are going to support privileges\n"
-"\tat all.\n"
-"      </para>\n"
-"    </sect2>\n"
-" ########## END UNIMPLEMENTED FEATURESET ############ -->\n"
-
-#~ msgid ""
-#~ "    <para>\n"
-#~ "       To view yesterday's appointments, &mdash;last week's, if you're "
-#~ "in\n"
-#~ "       the weekly view, and last month's for the monthly view&mdash; "
-#~ "click\n"
-#~ "       the <guibutton>Prev</guibutton> button.  For tomorrow, next week,\n"
-#~ "       or next month, click <guibutton>Next</guibutton>, and of course,\n"
-#~ "       click <guibutton>Today</guibutton> for today.\n"
-#~ "    </para>\n"
-#~ msgstr ""
-#~ "    <para>\n"
-#~ "       Para ver las citas de ayer, &mdash;de la semana pasada, si esta "
-#~ "en\n"
-#~ "       la vista semanal, y del mes pasado en la vista mensual&mdash; "
-#~ "pulse\n"
-#~ "       el botón <guibutton>Anterior</guibutton>.  Para mañana, la semana "
-#~ "que\n"
-#~ "       viene o el mes próximo, pulse <guibutton>Siguiente</guibutton>, y\n"
-#~ "       naturalmente, pulse <guibutton>Hoy</guibutton> para hoy.\n"
-#~ "    </para>\n"
diff --git a/help/es.po/usage-contact.sgml.po b/help/es.po/usage-contact.sgml.po
deleted file mode 100644
index 04cfc5c703..0000000000
--- a/help/es.po/usage-contact.sgml.po
+++ /dev/null
@@ -1,1225 +0,0 @@
-# Translation into Spanish of Evolution docs.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Héctor García Álvarez <hector@scouts-es.org>, 2000.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution-docs\n"
-"POT-Creation-Date: 2001-04-20 13:43+0200\n"
-"PO-Revision-Date: 2000-12-28 15:38+0100\n"
-"Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: tmp/usage-contact.sgml.h:1
-msgid ""
-"\t  <para>\n"
-"\t    Ray wants to schedule a meeting with Company X, so he\n"
-"\t    checks the network for the Company X address card so he\n"
-"\t    knows whom to call there.  Since his company also shares\n"
-"\t    calendars, he then learns that his co-worker Deanna has\n"
-"\t    already scheduled a meeting with Company X next Thursday.\n"
-"\t    He can either go to the meeting himself or ask Deanna to\n"
-"\t    discuss his concerns for him.  Either way, he avoids\n"
-"\t    scheduling an extra meeting with Company X. \n"
-"\t </para>\n"
-msgstr ""
-"\t  <para>\n"
-"\t    Raul quiere concertar una reunión con la Compañía X, así que\n"
-"\t    busca en la red la tarjeta de la Compañía X para saber a quien tiene\n"
-"\t    que llamar.  Dado que su compañia comparte un calendario, ve que su\n"
-"\t    compañera Diana ya ha concertado una reunión con la Compañía X para "
-"el\n"
-"\t    próximo jueves.  Puede ir el mismo a la reunión o pedir a Diana que\n"
-"\t    trate el tema por el.  De cualquier modo, evita concertar otra cita\n"
-"\t    co la Compañía X. \n"
-"\t </para>\n"
-
-#: tmp/usage-contact.sgml.h:12
-msgid "\t  <title>Evolution Contact Editor</title>\n"
-msgstr "\t  <title>Editor de contactos de Evolution</title>\n"
-
-#: tmp/usage-contact.sgml.h:14
-msgid ""
-"\t <para>\n"
-"\t    He opens his contacts folder, and runs a quick search for\n"
-"\t    \"Curtis.\" There are eighteen different people with that name\n"
-"\t    in the file. He then enters \"Sales,\" and\n"
-"\t    <application>Evolution</application> narrows it down to the\n"
-"\t    right Curtis. He only becomes annoyed when he discovers that\n"
-"\t    the call was not actually important.\n"
-"          </para>\n"
-msgstr ""
-"\t <para>\n"
-"\t    Abre la carpeta de contactos, y realiza una busqueda rápida por\n"
-"\t    \"Curtis\". Hay dieciocho personas diferentes con ese nombre en el\n"
-"\t    archivo. Entonces escribe \"Ventas\", y\n"
-"\t    <application>Evolution</application> lo reduce al Curtis correcto.\n"
-"\t    Tan solo se siente molesto cuando descubre que la llamada no era\n"
-"\t    realmente importante.\n"
-"          </para>\n"
-
-#: tmp/usage-contact.sgml.h:23
-msgid ""
-"\t<para>\n"
-"\t    Tom comes back from lunch and finds a note on his\n"
-"\t    keyboard: \"Curtis in sales called for you, but he didn't\n"
-"\t    leave a number, and I forgot to write down the name of the\n"
-"\t    company he works for. He said it was important, though.\"\n"
-"\t    Tom is not at all annoyed.\n"
-"         </para>\n"
-msgstr ""
-"\t<para>\n"
-"\t    Tom vuelve de almorzar y se encuantra una nota en su teclado:\n"
-"\t    \"Le ha llamado Curtis de ventas, pero no dejo un teléfono,\n"
-"\t    y se me olvidó anotar la compañía para la que trabaja. Eso si, dijo\n"
-"\t    que era importante.\"\n"
-"\t    Tom no está molesto en absoluto.\n"
-"         </para>\n"
-
-#: tmp/usage-contact.sgml.h:31
-msgid ""
-"\t<para>\n"
-"\t   The simplest way to group address cards is to use folders.\n"
-"\t   By default, cards start in the\n"
-"\t   <guilabel>Contacts</guilabel> folder.  If you've read <xref\n"
-"\t   linkend=\"usage-mainwindow\"> then you already know that you\n"
-"\t   can create a new folder by selecting \n"
-"           <menuchoice>\n"
-"           <guimenu>File</guimenu>\n"
-"\t   <guisubmenu>New</guisubmenu>\n"
-"\t   <guimenuitem>Folder</guimenuitem>\n"
-"           </menuchoice>\n"
-"           and that you can put new folders anywhere you like. Just\n"
-"\t   like with mail, cards must be in a card folder, and no card\n"
-"\t   can be in two places at once.  If you want more\n"
-"\t   flexibility, try <xref\n"
-"\t   linkend=\"usage-contact-organize-group-category\">.\n"
-"\t </para>\n"
-msgstr ""
-"\t<para>\n"
-"\t   La manera más sencilla de agrupar tarjetas de direcciones es usar\n"
-"\t   carpetas.  Por defecto, las tarjetas están en la carpeta\n"
-"\t   <guilabel>Contactos</guilabel>.  Si ha leido <xref\n"
-"\t   linkend=\"usage-mainwindow\"> entonces sabrá que puede crear una nueva\n"
-"\t   carpeta seleccionando \n"
-"           <menuchoice>\n"
-"           <guimenu>Archivo</guimenu>\n"
-"\t   <guisubmenu>Nuevo</guisubmenu>\n"
-"\t   <guimenuitem>Carpeta</guimenuitem>\n"
-"           </menuchoice>\n"
-"           y que puede poner nuevas carpetas en cualquier sitio que quiera.\n"
-"\t   Exactamente como con el correo, las tarjetas deben estar en una "
-"carpeta\n"
-"\t   de tarjetas, y ninguna tarjeta puede estar en dos sitios a la vez.  Si\n"
-"\t   quiere más flexibilidad, pruebe <xref\n"
-"\t   linkend=\"usage-contact-organize-group-category\">.\n"
-"\t </para>\n"
-
-#: tmp/usage-contact.sgml.h:49
-msgid ""
-"\t<para>\n"
-"           The other way to group cards is to mark them as belonging\n"
-"           to different categories.  The difference between folders\n"
-"           and categories is that folders contain cards, but category\n"
-"           membership is a property of each card.  That means that you\n"
-"           can mark a card as being in several categories or no\n"
-"           category at all.  For example, I put my friend Matthew's\n"
-"           card in the \"Business\" category, because he works with me,\n"
-"           the \"Friends\" category, because he's also my friend, and\n"
-"           the \"Frequent\" category, because I call him all the time\n"
-"           and can never remember his phone number.  \n"
-"        </para>\n"
-msgstr ""
-"\t<para>\n"
-"           La otra manera de agrupar tarjetas es marcarlas como\n"
-"           pertenecientes a distintas categorias.  La diferencia entre\n"
-"           carpetas y categorias es que las carpetas contienen las "
-"tarjetas,\n"
-"           pero pertenecer a una categoría es una propiedad de cada "
-"tarjeta.\n"
-"           Lo que significa que puede marcar una tarjeta como perteneciente\n"
-"           a varias categorias o a ninguna.  Por ejemplo, yo pongo la\n"
-"           tarjeta de mi amigo Matthew en la categoría \"Negocios\", porque\n"
-"           trabaja conmigo, en la categoría \"Amigos\", porque tambien es "
-"mi\n"
-"           amigo, y en la categoría \"Frecuente\", porque le llamo\n"
-"           continuamente y nunca me acuerdo de su número de teléfono.\n"
-"        </para>\n"
-
-#: tmp/usage-contact.sgml.h:62
-msgid ""
-"\t<para>\n"
-"           Then, you can refer to all the cards in that category by:\n"
-"           <!-- FIXME --> Waiting for Evolution to support the\n"
-"           operation.\n"
-"         </para>\n"
-msgstr ""
-"\t<para>\n"
-"           Entonces, puede referirse a todas las tarjetas en esa categoría\n"
-"           haciendo: <!-- ARREGLAME --> Esperando a que Evolution soporte\n"
-"           la operación.\n"
-"         </para>\n"
-
-#: tmp/usage-contact.sgml.h:68
-msgid ""
-"\t<para>\n"
-"           To mark a card as belonging to a category, click the\n"
-"           <guibutton>Categories</guibutton> button at the lower\n"
-"           right.  From the dialog box that appears, you can check as\n"
-"           many or as few categories as you like.\n"
-"        </para>\n"
-msgstr ""
-"\t<para>\n"
-"           Para marcar una tarjeta como perteneciente a una categoría, "
-"pulse\n"
-"           botón <guibutton>Categorias</guibutton> abajo a la derecha.\n"
-"           De la ventana de diálogo que aparece, puede marcar tantas\n"
-"           categorías como quiera.\n"
-"        </para>\n"
-
-#: tmp/usage-contact.sgml.h:75
-msgid ""
-"\t<para>\n"
-"          To put a card into a folder, just drag it there from the\n"
-"          folder view.  Remember that contact cards can only go in\n"
-"          contact folders, just like mail can only go in mail folders,\n"
-"          and calendars in calendar folders.\n"
-"         </para>\n"
-msgstr ""
-"\t<para>\n"
-"          Para poner una tarjeta en una carpeta, simplemente arrastrela "
-"allí\n"
-"          desde la vista de carpetas.  Recuerde que las tarjetas de\n"
-"          contactos solo pueden estar en carpetas de contactos, como el\n"
-"          correo solo puede estar en carpetas de correo, y los calendarios\n"
-"          en carpetas de calendarios.\n"
-"         </para>\n"
-
-#: tmp/usage-contact.sgml.h:82
-msgid "\t<title>Grouping with Categories</title>\n"
-msgstr "\t<title>Agrupando con Categorías</title>\n"
-
-#: tmp/usage-contact.sgml.h:84
-msgid "\t<title>Grouping with Folders</title>\n"
-msgstr "\t<title>Agrupando con Carpatas</title>\n"
-
-#: tmp/usage-contact.sgml.h:86
-msgid "\t<title>Refining a Quick Search</title>\n"
-msgstr "\t<title>Refinando una Búsqueda Rápida</title>\n"
-
-#: tmp/usage-contact.sgml.h:88
-msgid "\t<title>Sharing Address Cards and Calendar Data</title>\n"
-msgstr ""
-"\t<title>Conpartiendo Tarjetas de Direcciones y Datos del Calendario</"
-"title>\n"
-
-#: tmp/usage-contact.sgml.h:90
-msgid ""
-"       <!-- FIXME: Feature Not Implemented\n"
-"\t<para>\n"
-"\n"
-"           If the master list of categories doesn't suit you, you can\n"
-"           add your own.  Just enter the new category's name in the\n"
-"           text box, then click <guibutton>Categories</guibutton> and\n"
-"           choose <guilabel>Add to Master List</guilabel> in the\n"
-"           window that appears. \n"
-"         </para>\n"
-"       -->\n"
-msgstr ""
-"       <!-- ARREGLAME: Caracteristica no implementeada\n"
-"\t<para>\n"
-"\n"
-"           Si la lista principal de categorías no le es suficiente, puede\n"
-"           añadir las suyas propias.  Simplemente escriba el nombre de la\n"
-"           nueva categoría en la caja de texto, entonces pulse\n"
-"           <guibutton>Categorias</guibutton> y elija\n"
-"           <guilabel>Añadir a la Lista Principal</guilabel> en la ventana\n"
-"           aparece. \n"
-"         </para>\n"
-"       -->\n"
-
-#: tmp/usage-contact.sgml.h:101
-msgid ""
-"      <para>\n"
-"\t   Between <guilabel>Delete</guilabel> and <guilabel>View\n"
-"    \t   All</guilabel> is a quick search field. To use it, select\n"
-"    \t   from the drop-down list which sort of search you'd like to\n"
-"    \t   perform (the whole card, just the name, or just the email\n"
-"    \t   address), then enter one or more words in the text entry\n"
-"    \t   box, and press <keycap>Enter</keycap>.\n"
-"    \t   <application>Evolution</application> will search through\n"
-"    \t   the contents of every displayed card to find one that\n"
-"    \t   matches. You can refine searches by doing several in\n"
-"    \t   succession, or start over by pressing the <guibutton>View\n"
-"    \t   All</guibutton> button.\n"
-"\t</para>\n"
-msgstr ""
-"      <para>\n"
-"\t   Entre <guilabel>Borrar</guilabel> y <guilabel>Ver\n"
-"    \t   Todo</guilabel> hay un campo de búsqueda rápida. Para usarlo,\n"
-"    \t   elija de la lista descendente que clase de búsqueda quiere hacer\n"
-"    \t   (toda la tarjeta, solo el nombre, o solo la dirección de correo),\n"
-"    \t   entonces escriba una o más palabras en la caja de entrada de "
-"texto,\n"
-"    \t   y pulse <keycap>Enter</keycap>.\n"
-"    \t   <application>Evolution</application> buscará en los contenidos\n"
-"    \t   de todas las tarjetas mostradas para encontrar una que concuerde.\n"
-"    \t   Puede refinar las búsquedas haciendo varias búsquedas sucesivas,\n"
-"    \t   o empezar de nuevo pulsando el botón <guibutton>Ver\n"
-"    \t   Todas</guibutton>.\n"
-"\t</para>\n"
-
-#: tmp/usage-contact.sgml.h:115
-msgid ""
-"      <para>\n"
-"\t   If there are no matches, the card display will be\n"
-"\t   blank. When you'd like to see all the cards again, press\n"
-"\t   <guilabel>Show All</guilabel>.\n"
-"       </para>\n"
-msgstr ""
-"      <para>\n"
-"\t   Si no hay coincidencias, la tarjeta mostrada estará en blanco.\n"
-"\t   Cuando quiera volver a ver todas las tarjetas de nuevo, pulse\n"
-"\t   <guilabel>Mostrar Todas</guilabel>.\n"
-"       </para>\n"
-
-#: tmp/usage-contact.sgml.h:121
-msgid ""
-"      <para>\n"
-"\t You already know that when you are writing an email, you can\n"
-"\t address it to one or more people, and that\n"
-"\t <application>Evolution</application> will fill in addresses\n"
-"\t from your address book's address cards if you let it.  In\n"
-"\t addition to that, you can send email to everyone in a\n"
-"\t particular group if you choose.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"\t Ya sabe que cuando escribe un mensaje, puede dirigirlo a una o más\n"
-"\t personas, y que <application>Evolution</application> rellenará las\n"
-"\t direcciones con las direcciones de las tarjetas de su agenda si le\n"
-"\t deja.  Ademas, si quiere puede enviar mensajes a todos los de un\n"
-"\t grupo en particular.\n"
-"      </para>\n"
-
-#: tmp/usage-contact.sgml.h:130
-msgid ""
-"      <para>\n"
-"\tAs noted before, when you get information about a person in\n"
-"\tthe mail or in a calendar entry, you can add it to an address\n"
-"\tcard.  To do so, right click on any email address or email\n"
-"\tmessage, and select <guimenuitem>Add Address\n"
-"\tCard</guimenuitem> from the menu that appears.  Of course,\n"
-"\t<application> Evolution</application> also adds cards from a\n"
-"\thand-held device during HotSync operation.  For more\n"
-"\tinformation about that, see <xref linkend=\"usage-sync\">.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"\tComo se ha visto antes, cuando obtiene información acerca de una\n"
-"\tpersona en el correo o en una entrada del calendario, puede añadirla\n"
-"\ta una tarjeta de direcciones.  Para hacerlo, pulse con el botón\n"
-"\tderecho en cualquier dirección de correo o mensaje de correo, y\n"
-"\tseleccione <guimenuitem>Añadir Tarjeta de Direcciones</guimenuitem>\n"
-"\tdel menú que aparece.  Naturalmente,\n"
-"\t<application>Evolution</application> tambien añade tarjetas desde un\n"
-"\tdispositivo de mano durante la operación de sincronización.  Para más\n"
-"\tinformación acerca de eso, vea <xref linkend=\"usage-sync\">.\n"
-"      </para>\n"
-
-#: tmp/usage-contact.sgml.h:141
-msgid ""
-"      <para>\n"
-"\tThe contact editor window has two tabs,\n"
-"    \t<guilabel>General</guilabel>, for basic contact information,\n"
-"    \tand <guilabel>Details</guilabel>, for a more specific\n"
-"    \tdescription of the person.  In addition, it contains a\n"
-"    \t<guimenu>File</guimenu> menu, (see <xref\n"
-"    \tlinkend=\"menuref-contact-editor\">) and a toolbar with three\n"
-"    \titems: <guilabel>Save and Close</guilabel>,\n"
-"    \t<guilabel>Print</guilabel>, and <guilabel>Delete</guilabel>.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"\tLa ventana del editor de contactos tiene dos pestañas,\n"
-"    \t<guilabel>General</guilabel>, para información contacto básica,\n"
-"    \ty <guilabel>Detalles</guilabel>, para una descripción más específica\n"
-"    \tde la persona.  Ademas, contiene un menú\n"
-"    \t<guimenu>Archivo</guimenu>, (ver <xref\n"
-"    \tlinkend=\"menuref-contact-editor\">) y una barra de herramientas con\n"
-"    \ttres elementos: <guilabel>Guardar y Cerrar</guilabel>,\n"
-"    \t<guilabel>Imprimir</guilabel>, y <guilabel>Borrar</guilabel>.\n"
-"      </para>\n"
-
-#: tmp/usage-contact.sgml.h:152
-msgid ""
-"      <para>\n"
-"         <application>Evolution</application> offers two ways for you\n"
-"         to organize your cards.  The first way is to use folders;\n"
-"         this works the same way that mail folders do.  For more\n"
-"         flexibility, you can also mark contacts as members of\n"
-"         different categories.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"         <application>Evolution</application> le ofrece dos maneras de\n"
-"         organizar sus tarjetas.  La primera es usando carpetas.\n"
-"         Esto funciona igual que las carpetas de correo.  Para más\n"
-"         flexibilidad, puede marcar los contactos como miembros de\n"
-"         diferentes categorías.\n"
-"      </para>\n"
-
-#: tmp/usage-contact.sgml.h:160
-msgid ""
-"      <para>\n"
-"        Click <guibutton>Add Criterion</guibutton> to increase the\n"
-"        number of criteria you'd like to use in the search, and\n"
-"        <guibutton>Remove Criterion</guibutton> to remove one from the\n"
-"        bottom of the list.  Your criteria may be a search within the\n"
-"        <guilabel>Name</guilabel> or <guilabel>Email</guilabel>\n"
-"        fields; alternately you can choose to search through all the\n"
-"        fields with a regular expression.  Then, you can select from\n"
-"        all the familiar requirements like <guilabel>Begins\n"
-"        With</guilabel> and <guilabel>Does Not Contain</guilabel>,\n"
-"        decide whether to match <guilabel>All</guilabel> or\n"
-"        <guilabel>Any</guilabel> of your criteria, and press\n"
-"        <guibutton>Search</guibutton> to set it all off.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        Pulse <guibutton>Añadir Criterio</guibutton> para aumentar el\n"
-"        número de criterios que quiere usar en la búsqueda, y\n"
-"        <guibutton>Eliminar Criterio</guibutton> para eliminar uno del la\n"
-"        parte inferior de la lista.  Su criterio puede ser una búsqueda en\n"
-"        los campos <guilabel>Nombre</guilabel> o\n"
-"        <guilabel>Correo</guilabel>. Alternativamente puede elegir buscar "
-"en\n"
-"        todos los campos con una expresión regular.  Entonces, puede\n"
-"        seleccionar entre los requisistos <guilabel>Comienza con</guilabel>\n"
-"        y <guilabel>No contiene</guilabel>, decidir si deben conincidir\n"
-"        <guilabel>Todos</guilabel> o <guilabel>Alguno</guilabel> de sus\n"
-"        criterios, y pulsar <guibutton>Buscar</guibutton> para ejecutar\n"
-"        todo.\n"
-"      </para>\n"
-
-#: tmp/usage-contact.sgml.h:175
-msgid ""
-"      <para>\n"
-"        If you prefer to perform a more complex search, press\n"
-"        <guibutton>Find</guibutton> or choose\n"
-"        <menuchoice><guimenu>Tools</guimenu><guimenuitem>Search for\n"
-"        Contact</guimenuitem></menuchoice>. This will open the\n"
-"        in-depth search window, which lets you use multiple search\n"
-"        criteria in the same way that email filters and <glossterm\n"
-"        linkend=\"vfolder\">virtual folders</glossterm> do..  </para>\n"
-msgstr ""
-"      <para>\n"
-"        Si prefiere realizar una búsqueda más compleja, pulse\n"
-"        <guibutton>Buscar</guibutton> o elija\n"
-"        <menuchoice><guimenu>Herramientas</guimenu><guimenuitem>Buscar\n"
-"        Contacto</guimenuitem></menuchoice>. Esto abrirá la ventana de\n"
-"        búsqueda a fondo, que le permitirá usar multiples criterios de\n"
-"        búsqueda de la misma manera que en los filtros de correo y las\n"
-"        <glossterm linkend=\"vfolder\">carpetas virtuales</glossterm>.\n"
-"        </para>\n"
-
-#: tmp/usage-contact.sgml.h:184
-msgid ""
-"      <para> The <guilabel>General</guilabel> tab has seven sections,\n"
-"         each with an icon: a face, for name and company; a telephone\n"
-"         for phone numbers; an envelope for email address; a globe for\n"
-"         web page address; a house for postal address; a file folder\n"
-"         for contacts, and a briefcase for categories. \n"
-"    </para>\n"
-msgstr ""
-"      <para> La pestaña <guilabel>General</guilabel> tiene siete secciones,\n"
-"         cada una con un icono, una cara, para el nombre y la compañía, un\n"
-"         teléfono para números de teléfono, un sobre para direcciones de\n"
-"         correo, un globo terraqueo para direcciones de páginas web, una\n"
-"         casa para dirección postal, un archivador para contactos, y una\n"
-"         cartera para categorías. \n"
-"    </para>\n"
-
-#: tmp/usage-contact.sgml.h:191
-msgid "      <title>Evolution Address Book</title>\n"
-msgstr "      <title>Agenda de Direcciones de Evolution</title>\n"
-
-#: tmp/usage-contact.sgml.h:193
-msgid "      <title>Groups of contacts</title>\n"
-msgstr "      <title>Grupos de contactos</title>\n"
-
-#: tmp/usage-contact.sgml.h:195
-msgid "      <title>Managing a Mailing list</title>\n"
-msgstr "      <title>Administrando una Lista de Correo</title>\n"
-
-#: tmp/usage-contact.sgml.h:197
-msgid "      <title>Searching for Contacts</title>\n"
-msgstr "      <title>Buscando Contactos</title>\n"
-
-#: tmp/usage-contact.sgml.h:199
-msgid "      <title>Send me a Card: Adding New Cards Quickly</title>\n"
-msgstr ""
-"      <title>Envíame una Tarjeta: Añadiendo Tarjetas Rápidamente</title>\n"
-
-#: tmp/usage-contact.sgml.h:201
-msgid ""
-"     <para>\n"
-"       The <guilabel>Details</guilabel> tab is, fortunately, much more\n"
-"       simple: three sections, all of which are more or less obvious:\n"
-"       the briefcase next to the details about the contact's\n"
-"       professional life; the face next to the details about their\n"
-"       personal life; the globe next to a big blank space you can use\n"
-"       for anything and everything else you'd like to note about them.\n"
-"       If you ever wanted to have that uncanny knack for remembering\n"
-"       obscure details like the date of someone's anniversary (perhaps\n"
-"       your own) this is the way to develop it.\n"
-"     </para>\n"
-msgstr ""
-"     <para>\n"
-"       La pestaña de <guilabel>Detalles</guilabel> es, afortunadamente,\n"
-"       mucho más simple: tres secciones, las cuales son más o menos obvias:\n"
-"       la cartera al lado de los detalles acerca de la vida profesional del\n"
-"       contacto, la cara al lado de los detalles de su vida personal,\n"
-"       el globo terraqueo al lado de un gran espacio en blanco que puede\n"
-"       usar para cualquier cosa que quiera anotar.\n"
-"       Si alguna vez quiso tener ese poder sobrenatural de recordar oscuros\n"
-"       detalles como la fecha del aniversario de alguien (quiza del suyo\n"
-"       propio) esta es la manera de desarrollarlo.\n"
-"     </para>\n"
-
-#: tmp/usage-contact.sgml.h:213
-msgid ""
-"     <para>\n"
-"      The last item in the <guilabel>General</guilabel> tab is the\n"
-"       <guilabel>Categories</guilabel> organization tool; for\n"
-"       information on that, read <xref\n"
-"       linkend=\"usage-contact-organize\">.\n"
-"     </para>\n"
-msgstr ""
-"     <para>\n"
-"      El último elemento en la pestaña <guilabel>General</guilabel> es la\n"
-"       herramienta de organización de <guilabel>Categorias</guilabel>, para\n"
-"       ver información acerca de ella, lea <xref\n"
-"       linkend=\"usage-contact-organize\">.\n"
-"     </para>\n"
-
-#: tmp/usage-contact.sgml.h:220
-msgid ""
-"    <para>\n"
-"       If you keep your cards on a network using an <glossterm\n"
-"       linkend=\"ldap\">LDAP</glossterm> server, you can share access to\n"
-"       them, browse other address books, or maintain a shared set of\n"
-"       contact information for your company or your department.  This\n"
-"       is the sort of feature you'll want to use if your company has a\n"
-"       list of vendors and clients that needs constant updating.  If\n"
-"       share calendars as well as address books, people can avoid\n"
-"       duplicating work and keep up to date on developments within\n"
-"       their work-group or across the entire company.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"       Si tiene sus tarjetas en una red usando un servidor <glossterm\n"
-"       linkend=\"ldap\">LDAP</glossterm>, puede compartir el acceso a "
-"ellas,\n"
-"       ver otras agendas, o mantener información de contacto compartida\n"
-"       para su compañía o su departamento.  Esta es la clase de\n"
-"       características que querrá si su compañía tiene una lista de\n"
-"       vendedores y clientes que necesita ser actualizada constantemente.\n"
-"       Si se comparten calendarios al igual que agendas, la gente puede\n"
-"       evitar duplicar trabajo y mantenerse al día en los desarrollos de su\n"
-"       grupo de trabajo o de la compañía entera.\n"
-"    </para>\n"
-
-#: tmp/usage-contact.sgml.h:232
-msgid ""
-"    <para>\n"
-"       If you want to add or change cards, you'll use the contact\n"
-"       editor.  To change a card that already exists, double click on\n"
-"       it to open the contact editor window with all the current\n"
-"       information already filled in.  If you want to create a new\n"
-"       one, clicking the <guibutton>New</guibutton> button in the\n"
-"       toolbar will open the same window, with blank entry boxes for\n"
-"       you to fill in.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"       Si quiere añadir o cambiar tarjetas, usará el editor de contactos.\n"
-"       Para cambiar una tarjeta que ya existe, pulse dos veces sobre ella\n"
-"       para abrir la ventana del editor de contactos con toda la "
-"información\n"
-"       actual.  Si quiere crear una nueva, pulsando el botón\n"
-"       <guibutton>Nuevo</guibutton> el la barra de herramientas abrirá la\n"
-"       misma ventana, con los campos en blanco para que los rellene.\n"
-"    </para>\n"
-
-#: tmp/usage-contact.sgml.h:242
-msgid ""
-"    <para>\n"
-"       Of course, you don't want to share all of your cards&mdash; why\n"
-"       overload the network with a list of babysitters or tell\n"
-"       everyone in the office you're talking to new job prospects?  If\n"
-"       you keep cards on your own computer, you can decide which items\n"
-"       you want to make accessible to others.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"       Naturalmente, no quiere compartir todas sus tarjetas&mdash; ¿porque\n"
-"       sobrecargar la red con una lista de niñeras o decir a todos\n"
-"       en la oficina que esta buscando un nuevos trabajo?  Si mantiene\n"
-"       sus tarjetas en su propio ordenador, puede decidir que elementos\n"
-"       quiere hacer accesibles a otros.\n"
-"    </para>\n"
-
-#: tmp/usage-contact.sgml.h:250
-msgid ""
-"    <para>\n"
-"       Organizing your address book is a lot like organizing your\n"
-"       mail.  You can have folders and searches the same way you can\n"
-"       with mail, but the address book does not allow vFolders.  It\n"
-"       does, however, allow each card to fall under several\n"
-"       categories, and allow you to create your own categories.  To\n"
-"       learn about categories, read <xref\n"
-"       linkend=\"usage-contact-organize-group-category\">.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"       Organizar su agenda de direcciones es muy parecido a organizar su\n"
-"       correo.  Puede tener carpetas y búsquedas de la misma manera que\n"
-"       con el correo, pero la agenda no admite carpetas virtuales.  Lo\n"
-"       que si hace, es permitir a cada tarjeta estar en varias categorías,\n"
-"       y le permite crear sus propias categorías.  Para aprender acerca de\n"
-"       las categorías, lea <xref\n"
-"       linkend=\"usage-contact-organize-group-category\">.\n"
-"    </para>\n"
-
-#: tmp/usage-contact.sgml.h:260
-msgid ""
-"    <para>\n"
-"       The address book works closely with\n"
-"       <application>Evolution</application>'s mail and calendar tools.\n"
-"       For example, you can use the address book to help you manage\n"
-"       mailing lists, and send or recieve address cards over email.\n"
-"       More tools are on the way, and when they arrive, <!-- FIXME -->\n"
-"       they will be described in this section.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"       La agenda de direcciones trabaja bien con las herramientas\n"
-"       de correo y calendario de <application>Evolution</application>.\n"
-"       Por ejemplo, puede usar la agenda de direcciones para ayudarle a\n"
-"       administrar listas de correo, y enviar o recivir tarjetas por "
-"correo.\n"
-"       Hay más herramientas en camino, y cuando llegen, <!-- ARREGLAME -->\n"
-"       serán descritas en esta sección.\n"
-"    </para>\n"
-
-#: tmp/usage-contact.sgml.h:269
-msgid ""
-"    <para>\n"
-"       The toolbar for the address book is quite simple:\n"
-"       <itemizedlist>\n"
-"\t<listitem><para>\n"
-"           <guibutton>New</guibutton> creates a new card.\n"
-"\t</para></listitem>\n"
-"\n"
-"\t<listitem><para>\n"
-"           <guibutton>Find</guibutton> brings up an in-depth search window.\n"
-"         </para></listitem>\n"
-"\t\n"
-"\t<listitem><para>\n"
-"\t    <guibutton>Print</guibutton> sends one or more of your cards to the "
-"printer.\n"
-"\t</para></listitem>\n"
-"        <listitem><para>\n"
-"           <guibutton>Delete</guibutton> deletes a selected card.\n"
-"        </para></listitem>\n"
-"\n"
-"        <listitem><para> <guibutton>View All</guibutton> displays all\n"
-"           the address information in the folder.  Use this button to\n"
-"           refresh the display for a network folder, or to switch from\n"
-"           viewing the results of a search and see the whole contents.\n"
-"           </para></listitem>\n"
-"\n"
-"        <listitem><para> <guibutton>Stop</guibutton> stops loading\n"
-"           contact data from the network.  This button is only\n"
-"           relevant if you are looking at contact information on a\n"
-"           network.  </para></listitem>\n"
-"      </itemizedlist>\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"       La barra de herramientas para la agenda de direcciones en bastante\n"
-"       simple:\n"
-"       <itemizedlist>\n"
-"\t<listitem><para>\n"
-"           <guibutton>Nueva</guibutton> crea una nueva tarjeta.\n"
-"\t</para></listitem>\n"
-"\n"
-"\t<listitem><para>\n"
-"           <guibutton>Buscar</guibutton> aparece una ventana de búsqueda.\n"
-"         </para></listitem>\n"
-"\t\n"
-"\t<listitem><para>\n"
-"\t    <guibutton>Imprimir</guibutton> envía una o más tarjetas a la "
-"impresora.\n"
-"\t</para></listitem>\n"
-"        <listitem><para>\n"
-"           <guibutton>Borrar</guibutton> borra la tarjeta seleccionada.\n"
-"        </para></listitem>\n"
-"\n"
-"        <listitem><para> <guibutton>Ver Todo</guibutton> muestra la\n"
-"           información de todas las direcciones en la carpeta.  Use este\n"
-"           botón para actualizar una carpeta de red, o para cambiar de\n"
-"           ver los resultados de una búsqueda a ver todos los contenidos.\n"
-"           </para></listitem>\n"
-"\n"
-"        <listitem><para> <guibutton>Para</guibutton> detiene la carga\n"
-"           de la información de contacto de la red.  Este botón solo es\n"
-"           relevante si está buscando información de contacto en una red.\n"
-"           </para></listitem>\n"
-"      </itemizedlist>\n"
-"    </para>\n"
-
-#: tmp/usage-contact.sgml.h:300
-msgid ""
-"    <para>\n"
-"       To delete a card, click on it once to select it, then press the\n"
-"       <guibutton>Delete</guibutton> button.  If you have multiple\n"
-"       cards selected, you'll delete multiple cards.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"       Para borrar una tarjeta, pulse sobre ella una vez para "
-"seleccionarla,\n"
-"       entonces pulse el botón <guibutton>Borrar</guibutton>.  Si tiene\n"
-"       varias tarjetas seleccionadas, borrará varias tarjetas.\n"
-"    </para>\n"
-
-#: tmp/usage-contact.sgml.h:306
-msgid ""
-"    <para>\n"
-"       To learn how to add a remote directory to your available\n"
-"       contact folders, see <xref linkend=\"config-prefs-contact\">.\n"
-"       Once you have a connection, the network contacts folder or\n"
-"       folders will appear inside the <guilabel>External\n"
-"       Directories</guilabel> folder in the folder bar.  It will work\n"
-"       exactly like a local folder of cards, with the following\n"
-"       exceptions:\n"
-"       <itemizedlist>\n"
-"\n"
-"          <listitem>\n"
-"\t  <para>\n"
-"              Network folders are only available when you are\n"
-"              connected to the network.  If you use a laptop or have a\n"
-"              modem connection, you may wish to copy or cache the\n"
-"              network directory and then synchronize your copy with\n"
-"              the networked version periodically.  <!-- FIXME: HOW? -->\n"
-"\t  </para>\n"
-"\t  </listitem>\n"
-"\n"
-"          <listitem>\n"
-"\t  <para>\n"
-"              To prevent excess network traffic,\n"
-"              <application>Evolution</application> will not normally\n"
-"              load the contents of LDAP folders immediately upon\n"
-"              opening.  You must click <guilabel>Display\n"
-"              All</guilabel> before LDAP folder cards will be loaded\n"
-"              from the network. You can change this behavior in the\n"
-"              <interface>Contact Preferences</interface> window.\n"
-"          </para>\n"
-"\t  </listitem>\n"
-"\t  <listitem>\n"
-"\t  <para>\n"
-"              Your ability to view, change, add, and delete contacts\n"
-"              depends on the settings of the LDAP server. \n"
-"          </para>\n"
-"\t  </listitem>\n"
-"       </itemizedlist>\n"
-"     </para>\n"
-msgstr ""
-"    <para>\n"
-"       Para aprender a añadir un directorio remoto a sus carpetas de\n"
-"       contactos disponibles, vea <xref linkend=\"config-prefs-contact\">.\n"
-"       Una vez que ha conectado, la carpeta o carpetas de contactos de la\n"
-"       red aparecerán dentro de la carpeta <guilabel>Directorios\n"
-"       Externos</guilabel>.  Funcionará exactamente igual que una carpeta\n"
-"       de tarjetas local, con las siguientes excepciones:\n"
-"       <itemizedlist>\n"
-"\n"
-"          <listitem>\n"
-"\t  <para>\n"
-"              Las carpetas de red solo están disponibles cueando está\n"
-"              conectado a la red.  Si usa un portatil o tiene una conexión\n"
-"              por modem, puede que quiera copiar o cachear el directorio en\n"
-"              red y sincronizar periodicamente su copia con la versión en\n"
-"              la red.  <!-- ARREGLAME: ¿COMO? -->\n"
-"\t  </para>\n"
-"\t  </listitem>\n"
-"\n"
-"          <listitem>\n"
-"\t  <para>\n"
-"              Para prevenir el tráfico de red excesivo,\n"
-"              <application>Evolution</application> no cargará normalmente\n"
-"              los contenidos de las carpetas LDAP inmediatamente despues de\n"
-"              abrirlas.  Debe pulsar <guilabel>Mostrar Todo</guilabel> para\n"
-"              las carpetas LDAP sean cargadas de la red. Puede cambiar este\n"
-"               comportamiento en las\n"
-"              <interface>Preferencias de Contactos</interface> window.\n"
-"          </para>\n"
-"\t  </listitem>\n"
-"\t  <listitem>\n"
-"\t  <para>\n"
-"              Las posibilidades de ver, cambiar, añadir, y borrar contactos\n"
-"              dependen de la configuración del servidor LDAP. \n"
-"          </para>\n"
-"\t  </listitem>\n"
-"       </itemizedlist>\n"
-"     </para>\n"
-
-#: tmp/usage-contact.sgml.h:346
-msgid ""
-"    <para>\n"
-"       To open up your address book, click on\n"
-"       <guibutton>Contacts</guibutton> in the shortcut bar, or select\n"
-"       one of your contacts folders from the folder bar.  <xref\n"
-"       linkend=\"usage-contact-fig\"> shows the address book in all\n"
-"       its organizational glory.  By default, the address book\n"
-"       shows all your cards in alphabetical order, in a <glossterm\n"
-"       linkend=\"minicard\">minicard</glossterm> format.  You can select\n"
-"       other views from the <guimenu>View</guimenu> menu, and adjust\n"
-"       the width of the columns by clicking and dragging the grey\n"
-"       column dividers.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"       Para abrir su agenda de direcciones, pulse en\n"
-"       <guibutton>Contactos</guibutton> en la barra de atajos, o seleccion\n"
-"       una de sus carpetas de contactos de la barra de carpetas.  <xref\n"
-"       linkend=\"usage-contact-fig\"> muestra la agenda de direcciones en\n"
-"       la cima de la organizabilidad.  Por defecto, la agenda de "
-"direcciones\n"
-"       muestra todas las tarjetas en orden alfabético, en un formato de\n"
-"       <glossterm linkend=\"minicard\">minitarjeta</glossterm>.  Puede\n"
-"       seleccionar otras vistas del menú <guimenu>Vista</guimenu>, y\n"
-"       ajustar el ancho de las columnas pulsando y arrastrando los\n"
-"       divisores de columnas grises.\n"
-"    </para>\n"
-
-#: tmp/usage-contact.sgml.h:359
-msgid ""
-"    <para>\n"
-"       Your contact information fills the rest of the display.  Move\n"
-"       through the cards alphabetically with the buttons and the\n"
-"       scrollbar at the right of the window. Of course, if you have\n"
-"       more than a few people listed, you'll want some way of finding\n"
-"       them more quickly, which is why there's a search feature.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"       Su información de contacto rellena el resto de la vista. Muevase\n"
-"       por las tarjetas alfabéticamente con los botonrd y la barra de\n"
-"       desplazamiento a la derecha de la ventana. Naturalemnte, si tiene\n"
-"       listadas más de unas pocas personas, querrá una manera de\n"
-"       encontrarlas más rápidamente, que es para lo que está la función de\n"
-"       búsqueda.\n"
-"    </para>\n"
-
-#: tmp/usage-contact.sgml.h:367
-msgid ""
-"    <para>\n"
-"      Another advantage of the <application>Evolution</application>\n"
-"      address book is its integration with the rest of the\n"
-"      application.  When you look for someone's address, you can also\n"
-"      see a history of appointments with that person.  Or, you can\n"
-"      create address cards from emails with just a few clicks.  In\n"
-"      addition, searches and folders work in the same way they do in\n"
-"      the rest of Evolution.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"      Otra ventaja de la agenda de <application>Evolution</application>\n"
-"      es su integración con el resto de la aplicación.  Cuando busca la\n"
-"      dirección de alguien, también puede ver un historial de las citas con\n"
-"      esa persona.  O, puede crear tarjetas de direcciones de mensajes de\n"
-"      correo electrónico con unas pocas pulsaciones.  En suma, las\n"
-"      búsquedas y las carpetas funcionan de la misma manera que en el resto\n"
-"      de Evolution.\n"
-"    </para>\n"
-
-#: tmp/usage-contact.sgml.h:377
-msgid ""
-"    <para>\n"
-"      The <application>Evolution</application> address book can\n"
-"      handle all of the functions of an address book, phone book, or\n"
-"      Rolodex.  Of course, it's a lot easier to update\n"
-"      <application>Evolution</application> than it is to change an\n"
-"      actual paper book. <application>Evolution</application> also\n"
-"      allows easy synchronization with hand-held devices.  Since\n"
-"      <application>Evolution</application> supports the <glossterm\n"
-"      linkend=\"ldap\">LDAP</glossterm> directory protocol, you can use\n"
-"      it with almost any type of existing directory server on your\n"
-"      network.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"      La agenda de <application>Evolution</application> puede hacerse\n"
-"      cargo de toda la funcionalidad de una agenda de direcciones, de\n"
-"      una agenda de telefonos o de un Rolodex.  Naturalmente, es mucho\n"
-"      más facil actualizar <application>Evolution</application> que\n"
-"      cambiar una hoja de papel. <application>Evolution</application>\n"
-"      también permite una facil sincronización con dispositivos de\n"
-"      mano.  Dado que <application>Evolution</application> soporta el\n"
-"      protocolo de directirio <glossterm\n"
-"      linkend=\"ldap\">LDAP</glossterm>, puede usarlo con casi todos\n"
-"      servidores de directorio de su red.\n"
-"    </para>\n"
-
-#: tmp/usage-contact.sgml.h:390
-msgid ""
-"    <para>\n"
-"      This chapter will show you how to use the\n"
-"      <application>Evolution</application> address book to organize\n"
-"      any amount of contact information, share addresses over a\n"
-"      network, and several ways to save time with everyday tasks. To\n"
-"      learn about configuring the address book, see <xref\n"
-"      linkend=\"config-prefs-contact\">.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"      Este capítulo le mostrará como puede usar la agenda de\n"
-"      <application>Evolution</application> para organizar cualquier\n"
-"      cantidad de información, compartir direcciones a traves de una\n"
-"      red, y varias formas de ahorrar tiempo con las tareas de todos\n"
-"      los días. Para aprender a configurar la agenda, vea <xref\n"
-"      linkend=\"config-prefs-contact\">.\n"
-"    </para>\n"
-
-#: tmp/usage-contact.sgml.h:399
-msgid ""
-"    <para>\n"
-"     <variablelist>\n"
-"\n"
-"\t<varlistentry>\n"
-"\t  <term>Full Name</term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"              The <guilabel>Full Name</guilabel> field has two\n"
-"              major features:\n"
-"              <itemizedlist>\n"
-"\t\t<listitem>\n"
-"\t\t  <para>\n"
-"                    You can enter a name into the <guibutton>Full\n"
-"                    Name</guibutton> field, but you can also click the\n"
-"                    <guibutton>Full Name</guibutton> button to bring\n"
-"                    up a small dialog box with a few text boxes\n"
-"                    <variablelist>\n"
-"\t\t      <varlistentry>\n"
-"\t\t\t<term><guilabel>Title: </guilabel></term>\n"
-"\t\t\t<listitem> <para>\n"
-"\t                  Enter an honorific or select one from the menu.\n"
-"\t                </para></listitem>\n"
-"\t\t      </varlistentry>\n"
-"\t\t      <varlistentry>\n"
-"\t\t\t<term><guilabel>First: </guilabel></term>\n"
-"\t\t\t<listitem> <para>\n"
-"\t\t            Enter the first, or given, name.\n"
-"\t\t\t </para></listitem> \n"
-"\t\t      </varlistentry>\n"
-"\t\t      <varlistentry>\n"
-"\t\t\t<term><guilabel>Middle: </guilabel></term>\n"
-"\t\t\t<listitem> <para>\n"
-"\t\t\t  Enter the middle name or initial, if any.\n"
-"\t\t\t</para></listitem>\n"
-"\t\t      </varlistentry>\n"
-"\t\t      <varlistentry>\n"
-"\t\t\t<term><guilabel>Last: </guilabel></term>\n"
-"\t\t\t<listitem> <para>\n"
-"\t\t\t   Enter the last name (surname).\n"
-"\t\t\t </para></listitem>\n"
-"\t\t      </varlistentry>\n"
-"\t\t      <varlistentry>\n"
-"\t\t\t<term><guilabel>Suffix: </guilabel></term>\n"
-"\t\t\t<listitem> <para>\n"
-"\t\t\t   Enter suffixes such as \"Jr.\" or \"III.\"\n"
-"\t\t\t</para></listitem>\n"
-"\t\t      </varlistentry>\n"
-"\t\t    </variablelist>\n"
-"                   </para>\n"
-"\t\t</listitem>\n"
-"\t        <listitem>\n"
-"\t\t  <para>\n"
-"                    The <guilabel>Full Name</guilabel> field also\n"
-"                    interacts with the <guilabel>File As</guilabel>\n"
-"                    box to help you organize your contacts.\n"
-"                  </para>\n"
-"                  <para>\n"
-"                    To see how it works, type a name in the\n"
-"                    <guilabel>Full Name</guilabel> field:\n"
-"                    <userinput>Rupert T. Monkey</userinput>.  You'll\n"
-"                    notice that the <guilabel>File As</guilabel> field\n"
-"                    also fills up, but in reverse:\n"
-"                    <computeroutput>Monkey, Rupert</computeroutput>.\n"
-"                    You can pick <computeroutput>Rupert Monkey\n"
-"                    </computeroutput> from the drop-down, or type in\n"
-"                    your own, such as <userinput> T. Rupert Monkey\n"
-"                    </userinput>.\n"
-"                 </para>\n"
-"\t\t  <tip>\n"
-"\t\t    <title>Filing Suggestion</title>\n"
-"\t\t   \n"
-"\t\t    <para>\n"
-"                      Don't enter something entirely different from\n"
-"                      the actual name, since you might forget that\n"
-"                      you've filed Rupert's information under \"F\" for\n"
-"                      \"Fictitious Ximian Employee.\"\n"
-"                    </para>\n"
-"\t\t  </tip>\n"
-"\t\t</listitem>\n"
-"\t      </itemizedlist>\n"
-"             </para>\n"
-"           </listitem>\n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"            <term>Multiple Values for Fields</term>\n"
-"            <listitem>\n"
-"\t      <para>\n"
-"                If you click on the small arrow buttons next to the\n"
-"                <guilabel>Primary Email</guilabel> field, you can also\n"
-"                choose <guilabel>Email 2</guilabel> and\n"
-"                <guilabel>Email 3</guilabel>.  Although the contact\n"
-"                editor will only display one of those at any given\n"
-"                time, <application>Evolution</application> will\n"
-"                store them all.  The arrow buttons next to the\n"
-"                telephone and postal address fields work in the same\n"
-"                way.\n"
-"              </para>\n"
-"          </listitem>\n"
-"\t</varlistentry>\n"
-"      </variablelist>\n"
-"     </para>\n"
-msgstr ""
-"    <para>\n"
-"     <variablelist>\n"
-"\n"
-"\t<varlistentry>\n"
-"\t  <term>Nombre Completo</term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"              El campo <guilabel>Nombre Completo</guilabel> tiene dos\n"
-"              caracteristicas importantes:\n"
-"              <itemizedlist>\n"
-"\t\t<listitem>\n"
-"\t\t  <para>\n"
-"                Puede escribir un nombre en el campo <guibutton>Nombre\n"
-"                Completo</guibutton>, pero tambien puede pulsar sobre\n"
-"                el botón <guibutton>Nombre Completo</guibutton> para\n"
-"                que aparezca una pequeña ventana de diálogo con alguas\n"
-"                cajas de texto\n"
-"                    <variablelist>\n"
-"\t\t      <varlistentry>\n"
-"\t\t\t<term><guilabel>Título: </guilabel></term>\n"
-"\t\t\t<listitem> <para>\n"
-"\t                  Escriba una categoría o seleccione una del menú.\n"
-"\t                </para></listitem>\n"
-"\t\t      </varlistentry>\n"
-"\t\t      <varlistentry>\n"
-"\t\t\t<term><guilabel>Nombre: </guilabel></term>\n"
-"\t\t\t<listitem> <para>\n"
-"\t\t            Escriba el nombre.\n"
-"\t\t\t </para></listitem> \n"
-"\t\t      </varlistentry>\n"
-"\t\t      <varlistentry>\n"
-"\t\t\t<term><guilabel>Middle: </guilabel></term>\n"
-"\t\t\t<listitem> <para>\n"
-"\t\t\t  Enter the middle name or initial, if any.\n"
-"\t\t\t</para></listitem>\n"
-"\t\t      </varlistentry>\n"
-"\t\t      <varlistentry>\n"
-"\t\t\t<term><guilabel>Apellidos: </guilabel></term>\n"
-"\t\t\t<listitem> <para>\n"
-"\t\t\t   Escriba los apellidos.\n"
-"\t\t\t </para></listitem>\n"
-"\t\t      </varlistentry>\n"
-"\t\t      <varlistentry>\n"
-"\t\t\t<term><guilabel>Sufijo: </guilabel></term>\n"
-"\t\t\t<listitem> <para>\n"
-"\t\t\t   Escriba un sufujo como \"Junior\" o \"III.\"\n"
-"\t\t\t</para></listitem>\n"
-"\t\t      </varlistentry>\n"
-"\t\t    </variablelist>\n"
-"                   </para>\n"
-"\t\t</listitem>\n"
-"\t        <listitem>\n"
-"\t\t  <para>\n"
-"                   El campo <guilabel>Nombre Completo</guilabel>\n"
-"                   también interactua con la opción <guilabel>Archivar\n"
-"                   Como</guilabel> para ayudarle a organizar sus\n"
-"                   contactos.\n"
-"                  </para>\n"
-"                  <para>\n"
-"                    Vea como funciona, esbriba un nombre en el campo\n"
-"                    <guilabel>Nombre Completo</guilabel>:\n"
-"                    <userinput>Rupert T. Monkey</userinput>.  Verá\n"
-"                    que el campo <guilabel>Archivar Como</guilabel>\n"
-"                    también se rellena, pero inversamente:\n"
-"                    <computeroutput>Monkey, Rupert</computeroutput>.\n"
-"                    Puede elegir <computeroutput>Rupert Monkey\n"
-"                    </computeroutput> de la lista desplegable, o\n"
-"                    escribir el suyo propio, como\n"
-"                    <userinput>T. Rupert Monkey</userinput>.\n"
-"                 </para>\n"
-"\t\t  <tip>\n"
-"\t\t    <title>Consejos para Rellenar el Campo</title>\n"
-"\t\t   \n"
-"\t\t    <para>\n"
-"                      No escriba algo totalmente distinto al nombre\n"
-"                      real, dado que puede que olvide que achivó la\n"
-"                      información de Rupert bajo la \"F\" como\n"
-"                      \"Empleado Ficticio de Ximian\".\n"
-"                    </para>\n"
-"\t\t  </tip>\n"
-"\t\t</listitem>\n"
-"\t      </itemizedlist>\n"
-"             </para>\n"
-"           </listitem>\n"
-"\t</varlistentry>\n"
-"\t<varlistentry>\n"
-"            <term>Valores Múltiples para los Campos</term>\n"
-"            <listitem>\n"
-"\t      <para>\n"
-"                Si pulsa en el botón con una pequeña flecha al lado del\n"
-"                campo <guilabel>Correo Primario</guilabel>, puede elegir\n"
-"                <guilabel>Correo 2</guilabel> y\n"
-"                <guilabel>Correo 3</guilabel>.  Aunque el editor de\n"
-"                contactos solo mostrará uno al tiempo,\n"
-"                <application>Evolution</application> los almacenará\n"
-"                todos.  El botón con la flecha a lado de los campos\n"
-"                teléfono y dirección postal funcionan igual.\n"
-"              </para>\n"
-"          </listitem>\n"
-"\t</varlistentry>\n"
-"      </variablelist>\n"
-"     </para>\n"
-
-#: tmp/usage-contact.sgml.h:501
-msgid "    <title>Address Book Tools</title>\n"
-msgstr "    <title>Herramientas de la Agenda de Direcciones</title>\n"
-
-#: tmp/usage-contact.sgml.h:503
-msgid "    <title>Destroy, Create, and Change: The Contact Editor</title>\n"
-msgstr ""
-"    <title>Destruir, Crear, y Cambiar: El Editor de Contactos</title>\n"
-
-#: tmp/usage-contact.sgml.h:505
-msgid "    <title>Getting Started With the Address Book</title>\t\n"
-msgstr "    <title>Empezando con la Agenda de Direcciones</title>\t\n"
-
-#: tmp/usage-contact.sgml.h:507
-msgid "    <title>Organizing your Address Book</title>\n"
-msgstr "    <title>Organizando su Agenda de Direcciones</title>\n"
-
-#: tmp/usage-contact.sgml.h:509
-msgid "    <title>Sharing your Cards</title>\n"
-msgstr "    <title>Compartiendo sus Tarjetas</title>\n"
-
-#: tmp/usage-contact.sgml.h:511
-msgid "  <title>The Evolution Address Book</title>\n"
-msgstr "  <title>La Agenda de Direcciones de Evolution</title>\n"
-
-#: tmp/usage-contact.sgml.h:513
-msgid ""
-"<!--\n"
-"    <para>\n"
-"      Another useful <application>Evolution</application> feature is\n"
-"      its ability to recognize when people live or work together.  If\n"
-"      several people in your address book share an address, and you\n"
-"      change the address for one of them,\n"
-"      <application>Evolution</application> will ask you if you wish to\n"
-"      change the address for all of them, or just for one.\n"
-"    </para>\n"
-"-->\n"
-msgstr ""
-"<!--\n"
-"    <para>\n"
-"      Otra característica útil de <application>Evolution</application>\n"
-"      es su habilidad para reconocer cuando la gente vive o trabajan\n"
-"      juntos.  Si varias personas en su agenda de direcciones comparten\n"
-"      una dirección, y cambia la dirección de uno de ellos,\n"
-"      <application>Evolution</application> le preguntará si quiere\n"
-"      cambiar la dirección de todos, o solo la de uno de ellos.\n"
-"    </para>\n"
-"-->\n"
-
-#: tmp/usage-contact.sgml.h:524
-msgid ""
-"<!--\n"
-"<!DOCTYPE Chapter PUBLIC \"-//GNOME//DTD DocBook PNG Variant V1.1//EN\">\n"
-"-->\n"
-msgstr ""
-"<!--\n"
-"<!DOCTYPE Chapter PUBLIC \"-//GNOME//DTD DocBook PNG Variant V1.1//EN\">\n"
-"-->\n"
-
-#: tmp/usage-contact.sgml.h:528
-msgid ""
-"<!-- FIXME this feature not yet implemented \n"
-"\n"
-"      <para>\n"
-"         You can also use the address book to print postal addresses\n"
-"\t on mailing labels.  Future versions of\n"
-"\t <application>Evolution</application> will allow you to you\n"
-"\t export a group of cards to a spreadsheet, database, or word\n"
-"\t processor so you can print address labels or prepare large\n"
-"\t mailings.\n"
-"      </para>\n"
-" -->\n"
-msgstr ""
-
-#: tmp/usage-contact.sgml.h:540
-msgid ""
-"<!---  FIXME this feature not yet implemented \n"
-"    <sect2 id=\"usage-contact-automation-extra\">\n"
-"      <title>Map It!</title>\n"
-"      <para>\n"
-"\t Need a map or directions? Click\n"
-"\t <guibutton>MapIt</guibutton> from within the contact\n"
-"\t manager, and <application>Evolution</application> will\n"
-"\t map the address for you online.\n"
-"      </para>\n"
-"    </sect2>\n"
-"-->\n"
-msgstr ""
-
-#: tmp/usage-contact.sgml.h:552
-msgid ""
-"<!--- ############# This section isn't implemented yet either:\n"
-"    <sect2>\n"
-"      <title></title>\n"
-"      <para>\n"
-"        <tip>\n"
-"\t  <title>Contact Shortcuts</title>\n"
-"\t  <para>\n"
-"            You can add cards from within an email message or calendar\n"
-"            appointment.  While looking at an email, right-click on\n"
-"            any email address or message, and choose\n"
-"            <guimenuitem>Create Card for this Address</guimenuitem> or\n"
-"            <guimenuitem>Create Card for this Sender</guimenuitem>\n"
-"            from the menu.  While looking at a calendar appointment,\n"
-"            right-click any email address, and choose\n"
-"            <guimenuitem>Create Card for this Address</guimenuitem>.\n"
-"            (NOTE that feature may change!  unimplemented!)\n"
-"          </para>\n"
-"\t</tip>\n"
-"      </para>\n"
-"      <para>\n"
-"        You can move cards around just as you would move email\n"
-"        messages: dragging and dropping works, as does right-clicking\n"
-"        and choosing <guimenuitem>Move</guimenuitem> from the menu\n"
-"        that appears.\n"
-"      </para>\n"
-"    </sect2>\n"
-"############### SHORTCUT SECTION COMMENTED OUT FOR NOW -->\n"
-msgstr ""
diff --git a/help/es.po/usage-mail.sgml.po b/help/es.po/usage-mail.sgml.po
deleted file mode 100644
index f076b15554..0000000000
--- a/help/es.po/usage-mail.sgml.po
+++ /dev/null
@@ -1,2322 +0,0 @@
-# Translation into Spanish of Evolution docs.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Héctor García Álvarez <hector@scouts-es.org>, 2000.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution-docs\n"
-"POT-Creation-Date: 2001-04-20 13:43+0200\n"
-"PO-Revision-Date: 2000-12-28 15:38+0100\n"
-"Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: tmp/usage-mail.sgml.h:1
-msgid ""
-"\t    <para>\n"
-"\t      The composer is a WYSIWYG (What You See Is What You Get)\n"
-"\t      editor for HTML. That means that if you enter HTML\n"
-"\t      directly into the composer&mdash; say, <markup\n"
-"\t      role=\"html\">&lt;B&gt;Bold Text&lt;/B&gt</markup>, the\n"
-"\t      the composer will assume you meant exactly that string\n"
-"\t      of characters, and not \"make this text bold,\" as an HTML\n"
-"\t      composition tool or text editor would.\n"
-"\t    </para>\n"
-msgstr ""
-"\t    <para>\n"
-"\t      El compositor de correo en un editor WYSIWYG (What You See Is What\n"
-"\t      You Get \"Lo Que Ve Es Lo Que Obtiene\") de HTML. Esto significa "
-"que\n"
-"\t      si escribe directamente HTML en el editor&mdash; digamos, \n"
-"\t      <markup role=\"html\">&lt;B&gt;Bold Text&lt;/B&gt</markup>, el\n"
-"\t      editor asumirá que quiere escribir exactamente esa cada de\n"
-"\t      caracteres, y no \"hacer poner texto en Negrita,\" como haría una\n"
-"\t      herramienta de composición de HTML o un editor de texto.\n"
-"\t    </para>\n"
-
-#: tmp/usage-mail.sgml.h:11
-msgid "\t    <title>A Technical note on HTML Tags</title>\n"
-msgstr "\t    <title>Una nota Técnica sobre las Etiquetas HTML</title>\n"
-
-#: tmp/usage-mail.sgml.h:13
-msgid ""
-"\t  <para>\n"
-"\t    Hearkening back to the dark ages when people used\n"
-"\t    typewriters and there were no copy machines, \"Cc\" stands\n"
-"\t    for \"Carbon Copy.\"  Use it whenever you want to share a\n"
-"\t    message you've written to someone else.\n"
-"\t    <example id=\"ex-mail-cc\">\n"
-"\t      <title>Using the Cc: field</title>\n"
-"\t      <para>\n"
-"\t         When Susan sends an email to a client, she puts her\n"
-"\t         co-worker, Tim, in the in the\n"
-"\t         <guilabel>Cc:</guilabel> field, so that he know\n"
-"\t         what's going on.  The client can see that Tim also\n"
-"\t         received the message, and knows that he can talk to\n"
-"\t         Tim about the message as well.\n"
-"\t      </para>\n"
-"\t    </example>\n"
-"\t  </para>\n"
-msgstr ""
-"\t  <para>\n"
-"\t    Volviendo la vista a las edades oscuras cuando la gente usaba "
-"máquinas\n"
-"\t    de escribir y no habia fotocopiadoras, \"Cc\" significa\n"
-"\t    \"Copia de Carbón\".  Uselo cuando quiera compartir un mensaje que ha\n"
-"\t    escrito a otra persona.\n"
-"\t    <example id=\"ex-mail-cc\">\n"
-"\t      <title>Usando el campo Cc:</title>\n"
-"\t      <para>\n"
-"\t         Cuando Susan envia un mensaje a un cliente, pone a su compañero,\n"
-"\t         Tim, en el campo <guilabel>Cc:</guilabel>, para que sepa como "
-"van\n"
-"\t         las cosas.  El cliente puede ver que Tim también recivió el\n"
-"\t         mensaje, y sabe que también puede hablar con Tim acerca del\n"
-"\t         mensaje.\n"
-"\t      </para>\n"
-"\t    </example>\n"
-"\t  </para>\n"
-
-#: tmp/usage-mail.sgml.h:31
-msgid ""
-"\t  <para>\n"
-"\t    If you have a large number of recipients, or if you want\n"
-"\t    to send mail to several people without sharing the\n"
-"\t    recipient list, you should use\n"
-"\t    <guilabel>Bcc:</guilabel>. \"Bcc\" stands for \"Blind Carbon\n"
-"\t    Copy\", and it sends messages discreetly.  In other words,\n"
-"\t    the people in the <guilabel>Bcc:</guilabel> field get the\n"
-"\t    message, but nobody sees that they got it.  Note that the\n"
-"\t    contents of the <guilabel>To:</guilabel> and\n"
-"\t    <guilabel>Cc:</guilabel> fields are visible to all\n"
-"\t    recipients, even to people on the\n"
-"\t    <guilabel>Bcc:</guilabel> list.\n"
-"\n"
-"\t    <example id=\"ex-mail-bcc\">\n"
-"\t      <title>Using the Bcc: field</title>\n"
-"\t      <para>\n"
-"\t         Tim is sending an email announcement to all of his\n"
-"\t         company's clients, some of whom are in competition\n"
-"\t         with each other, and all of whom value their\n"
-"\t         privacy. He needs to use the\n"
-"\t         <guilabel>Bcc:</guilabel> field here.  If he puts\n"
-"\t         every address from his address book's \"Clients\"\n"
-"\t         category into the <guilabel>To:</guilabel> or\n"
-"\t         <guilabel>Cc:</guilabel> fields, he'll make the\n"
-"\t         company's <emphasis>entire</emphasis> client list\n"
-"\t         public. It seems like a small difference, but it can\n"
-"\t         make a huge difference in some situations.\n"
-"\t     </para>\n"
-"\t    </example>\n"
-"\t  </para>\n"
-msgstr ""
-"\t  <para>\n"
-"\t    Si tiene un gran número de destinatarios, o si quiere mandar mensajes\n"
-"\t    a varias personas sin mostrar la lista de destinatarios, debe usar\n"
-"\t    <guilabel>Cco:</guilabel>. \"Cco\" significa \"Con Copia Oculta\",\n"
-"\t    y envía los mensajes discretamente.  En otras palabras,\n"
-"\t    las personas en el campo <guilabel>Cco:</guilabel> reciven el "
-"mensaje,\n"
-"\t    pero nadie vee que lo recibieron.  Note que el contenido de los "
-"campos\n"
-"\t    <guilabel>A:</guilabel> y <guilabel>Cc:</guilabel> son visibles para\n"
-"\t    todos los destinatarios, incluso para las personas en la lista\n"
-"\t    <guilabel>Cco:</guilabel>.\n"
-"\n"
-"\t    <example id=\"ex-mail-bcc\">\n"
-"\t      <title>Usando el campo Cco:</title>\n"
-"\t      <para>\n"
-"\t         Tim está enviando un anuncio por correo a todos los clientes\n"
-"\t         de su compañía, algunos de los cuales son competidores entre si,\n"
-"\t         y todos ellos valoran su privacidad. En este caso necesita usar\n"
-"\t         el campo <guilabel>Cco:</guilabel>.  Si pone todas las\n"
-"\t         direcciones de su agenda de direcciones de \"Clientes\" en el\n"
-"\t         campo <guilabel>A:</guilabel> o en el campo\n"
-"\t         <guilabel>Cc:</guilabel>, hara que <emphasis>toda</emphasis>\n"
-"\t         la lista de clientes de la compañía sea pública.\n"
-"\t         Parece una pequeña diferencia, pero en ocasiones puede tener\n"
-"\t         una gran importancia.\n"
-"\t     </para>\n"
-"\t    </example>\n"
-"\t  </para>\n"
-
-#: tmp/usage-mail.sgml.h:62
-msgid ""
-"\t  <para>\n"
-"\t    Some people do not have HTML-capable mail clients, or\n"
-"\t    prefer not to receive HTML-enhanced mail because it is\n"
-"\t    slower to download and display.  <emphasis>Some</emphasis>\n"
-"\t    people refer to HTML mail as \"the root of all evil\" and\n"
-"\t    get very angry if you send them HTML mail, which is why\n"
-"\t    <application>Evolution</application> sends plain text\n"
-"\t    unless you explicitly ask for HTML.  To send HTML mail,\n"
-"\t    you will need to select <menuchoice>\n"
-"\t    <guimenu>Format</guimenu> <guimenuitem>\n"
-"\t    HTML</guimenuitem></menuchoice>.  Alternately, you can set\n"
-"\t    your default mail format preferences in the mail\n"
-"\t    configuration dialog.  See <xref\n"
-"\t    linkend=\"config-prefs-mail-other\"> for more information.\n"
-"          </para>\n"
-msgstr ""
-"\t  <para>\n"
-"\t    Algunas personas no tienen clientes con capacidad para mostrar HMTL, "
-"o\n"
-"\t    prefieren no recibir mensajes con HTML porque tarda más en descargar\n"
-"\t    y en ser mostrado.  <emphasis>Algunas</emphasis> personas se hablan\n"
-"\t    correo con HTML como \"la raíz de todos los males\" y se enfadan\n"
-"\t    mucho si les envia correo con HTML, por lo cual\n"
-"\t    <application>Evolution</application> envía texto plano a menos que\n"
-"\t    pida explicitamente HTML.  Para enviar correo con HTML, necesitará\n"
-"\t    seleccionar <menuchoice> <guimenu>Formato</guimenu>\n"
-"\t    <guimenuitem>HTML</guimenuitem></menuchoice>.\n"
-"\t    Alternativamente, puede elegir el formato por defecto de sus mensajes\n"
-"\t    en el diálogo de configuración del correo.\n"
-"\t    Vea <xref linkend=\"config-prefs-mail-other\"> para más información.\n"
-"          </para>\n"
-
-#: tmp/usage-mail.sgml.h:78
-msgid ""
-"\t  <para>\n"
-"            Alternately, you can click on the\n"
-"            <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or\n"
-"            <guibutton>Bcc:</guibutton> buttons to get a list &mdash;\n"
-"            potentially a very long one &mdash; of the email addresses\n"
-"            in your contact manager.  Select addresses and click on\n"
-"            the arrows to move them into the appropriate address\n"
-"            columns.\n"
-"          </para>\n"
-msgstr ""
-"\t  <para>\n"
-"            Alternativamente, puede pulsar en los botones\n"
-"            <guibutton>A:</guibutton>, <guibutton>Cc:</guibutton>, o\n"
-"            <guibutton>Cco:</guibutton> para obtener una lista &mdash;\n"
-"            potencialmente muy larga &mdash; de las direcciones de correo\n"
-"            de su administrador de contactos.  Seleccione las direcciones y\n"
-"            pulse sobre las flechas para moverlas a la columna de "
-"direcciones\n"
-"            apropiada.\n"
-"          </para>\n"
-
-#: tmp/usage-mail.sgml.h:88
-msgid ""
-"\t  <para>\n"
-"            For more information about using email together with the\n"
-"\t    contact manager and the calendar, see <xref\n"
-"\t    linkend=\"usage-contact-automate\"> and <xref\n"
-"\t    linkend=\"usage-calendar-apts\">.\n"
-"\t  </para>\n"
-msgstr ""
-"\t  <para>\n"
-"            Para más información acerca de usar el correo junto con el\n"
-"\t    administrador de contactos y el calendario, vea <xref\n"
-"\t    linkend=\"usage-contact-automate\"> y <xref\n"
-"\t    linkend=\"usage-calendar-apts\">.\n"
-"\t  </para>\n"
-
-#: tmp/usage-mail.sgml.h:95
-msgid ""
-"\t  <para>\n"
-"            The icons in the toolbar are explained in <glossterm\n"
-"            linkend=\"tooltip\">tool-tips</glossterm>, which appear when\n"
-"            you hold your mouse over the buttons.  The buttons fall\n"
-"            into four categories:\n"
-"            <variablelist>\n"
-"             <varlistentry>\n"
-"             <term>Headers and lists</term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                  At the left edge of the toolbar, you can choose\n"
-"                  <guilabel>Normal</guilabel> for a default text style\n"
-"                  or <guilabel>Header 1</guilabel> through\n"
-"                  <guilabel>Header 6</guilabel> for varying sizes of\n"
-"                  header from large (1) to tiny (6). Other styles\n"
-"                  include <guilabel>pre</guilabel>, to use the HTML\n"
-"                  tag for preformatted blocks of text, and three types\n"
-"                  of <guilabel>List Item</guilabel> for the highly\n"
-"                  organized.\n"
-"                </para>\n"
-"\t      </listitem>\n"
-"           </varlistentry>\n"
-"           <varlistentry>\n"
-"             <term>Text style</term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                  Use these buttons to determine the way your letters\n"
-"                  look.  If you have text selected, the style will\n"
-"                  apply to the selected text.  If you do not have text\n"
-"                  selected, the style will apply to whatever you type\n"
-"                  next.  The buttons are:\n"
-"                  <itemizedlist mark=\"none\">      \n"
-"\t\t  <listitem><para>Push <guibutton>B</guibutton> for bold text</para></"
-"listitem>   \n"
-"                  <listitem><para>Push <guibutton>I</guibutton> for italics</"
-"para></listitem>\n"
-"\t\t  <listitem><para>Push <guibutton>U</guibutton> to underline</para></"
-"listitem>\n"
-"\t\t  <listitem><para>Push <guibutton>S</guibutton> for a strikethrough.</"
-"para></listitem>\n"
-"                 </itemizedlist>\n"
-"               </para>               \n"
-"\t      </listitem>    \n"
-"\t    </varlistentry>\n"
-"\t    <varlistentry>\n"
-"\t      <term>Alignment</term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                   Located next to the text style buttons, these three\n"
-"                   paragraph icons should be familiar to users of most\n"
-"                   word processing software.  The leftmost button will\n"
-"                   make your text aligned to the left, the center\n"
-"                   button, centered, and the right hand button,\n"
-"                   aligned on the right side.\n"
-"                </para>\n"
-"\t      </listitem>\n"
-"\t      </varlistentry>\n"
-"\n"
-"\t    <varlistentry>\n"
-"\t      <term>Indentation rules</term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                  The button with the arrow pointing left will reduce\n"
-"                  a paragraph's indentation, and the right arrow will\n"
-"                  increase its indentation.\n"
-"               </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t    <varlistentry>\n"
-"\t      <term>Color Selection</term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                  At the far right is the color section tool.  The\n"
-"                  colored box displays the current text color; to\n"
-"                  choose a new one, click the arrow button just to the\n"
-"                  right. If you have text selected, the color will\n"
-"                  apply to the selected text.  If you do not have text\n"
-"                  selected, the color will apply to whatever you type\n"
-"                  next.\n"
-"               </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  </variablelist>\n"
-"        </para>\n"
-msgstr ""
-"\t  <para>\n"
-"            Los iconos de la barra de herramientas estan explicados en "
-"<glossterm\n"
-"            linkend=\"tooltip\">Mensajes de Ayuda</glossterm>, los cuales "
-"aparecen\n"
-"            cuando detiene el ratón sobre los botónes.  Los botones entran "
-"en cuatro\n"
-"            categorías:\n"
-"            <variablelist>\n"
-"             <varlistentry>\n"
-"             <term>Cabeceras y listas</term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                  En el lado izquierdo de la barra de herramientas, puede "
-"elegir entre\n"
-"                  <guilabel>Normal</guilabel> para un estilo de texto por "
-"defecto\n"
-"                  o <guilabel>Cabecera 1</guilabel> a\n"
-"                  <guilabel>Cabecera 6</guilabel> para variar los tamaños de "
-"las\n"
-"                  cabeceras desde grande (1) hasta pequeño (6). Otros "
-"estilos\n"
-"                  incluyen <guilabel>pre</guilabel>, para usar etiquetas "
-"HTML\n"
-"                  para preformatear los bloques de texto, y tres tipos de\n"
-"                  <guilabel>Elementos de Lista</guilabel> para los más\n"
-"                  organizados.\n"
-"                </para>\n"
-"\t      </listitem>\n"
-"           </varlistentry>\n"
-"           <varlistentry>\n"
-"             <term>Estilo del texto</term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                  Use estos botones para determinar el aspecto de sus "
-"cartas.\n"
-"                  Si tiene un texto seleccionado, el estilo se aplicará al "
-"texto\n"
-"                  seleccionado.  Si no tiene texto seleccionado el estilo "
-"se\n"
-"                  aplicará a lo siguiente que escriba.  Los botones son:\n"
-"                  <itemizedlist mark=\"none\">      \n"
-"\t\t  <listitem><para>Presione <guibutton>B</guibutton> para texto en "
-"negrita</para></listitem>   \n"
-"                  <listitem><para>Presione <guibutton>I</guibutton> para "
-"itálicas</para></listitem>\n"
-"\t\t  <listitem><para>Presione <guibutton>U</guibutton> para subrayado</"
-"para></listitem>\n"
-"\t\t  <listitem><para>Presione <guibutton>S</guibutton> para tachado.</"
-"para></listitem>\n"
-"                 </itemizedlist>\n"
-"               </para>               \n"
-"\t      </listitem>    \n"
-"\t    </varlistentry>\n"
-"\t    <varlistentry>\n"
-"\t      <term>Alineación</term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                   Localizado al lado de los botones de estilo del texto, "
-"estos tres\n"
-"                   iconos de párrafo deberian ser familiares para aquellos "
-"usuarios de\n"
-"                   la mayoría de los procesadores de texto.  El botón más a "
-"la izquierda\n"
-"                   hará que su texto se alinee a la izquierda, el botón "
-"central, lo\n"
-"                   centrará, y el botón a la derecha, lo alinerá al lado "
-"derecho.\n"
-"                </para>\n"
-"\t      </listitem>\n"
-"\t      </varlistentry>\n"
-"\n"
-"\t    <varlistentry>\n"
-"\t      <term>Reglas de indentación</term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                  El botón con la flecha hacia la izquierda reducirá\n"
-"                  la indentación de un párrafo, y la flecha a la derecha\n"
-"                  incrementará su indentación.\n"
-"               </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t    <varlistentry>\n"
-"\t      <term>Selección de colores</term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                  En la parte derecha esta la herramienta de selección de "
-"color.\n"
-"                  La caja coloreada muestra el color actual del texto. Para\n"
-"                  elegir uno nuevo, pulse el botón con la flecha justo a su "
-"derecha.\n"
-"                  Si tiene texto seleccionado, el color será aplicado al "
-"texto\n"
-"                  seleccionado.  Si no tiene texto seleccionado, el color "
-"será aplicado\n"
-"                  a lo que escriba a continuación.\n"
-"               </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  </variablelist>\n"
-"        </para>\n"
-
-#: tmp/usage-mail.sgml.h:179
-msgid "\t  <title>Evolution Mail</title>\n"
-msgstr "\t  <title>Correo de Evolution</title>\n"
-
-#: tmp/usage-mail.sgml.h:181
-msgid "\t  <title>HTML Mail is not a Default Setting</title>\n"
-msgstr ""
-"\t  <title>El correo con HTML no está seleccionado por defecto</title>\n"
-
-#: tmp/usage-mail.sgml.h:183
-msgid "\t <title>The Filter Assistant</title>\n"
-msgstr "\t <title>El Asistente de Filtros</title>\n"
-
-#: tmp/usage-mail.sgml.h:185
-msgid "\t<!--  (INSERT SCREENSHOT HERE: virtual folders in action) -->\n"
-msgstr "\t<!--  (INSERT SCREENSHOT HERE: virtual folders in action) -->\n"
-
-#: tmp/usage-mail.sgml.h:187
-msgid ""
-"\t<para>\n"
-"\t    If you want to attach a file to your email message, you\n"
-"\t    can drag it from your desktop into the message window, or\n"
-"\t    click the button in the toolbar with a paper clip on it,\n"
-"\t    labelled <guibutton>Attach</guibutton>.  If you click the\n"
-"\t    <guibutton>Attach</guibutton> button,\n"
-"\t    <application>Evolution</application> will open a file\n"
-"\t    selection dialog box to ask you which file you want to\n"
-"\t    send.  Select the file and click <guilabel>OK</guilabel>.\n"
-"        </para>\n"
-msgstr ""
-"\t<para>\n"
-"\t    Si quiere adjuntar un archivo a su mensaje de correo, puede\n"
-"\t    arrastrarlo desde su escritorio hasta la ventana del mensaje, o\n"
-"\t    pulsar el botón con un clip de la barra de herramientas,\n"
-"\t    con el título <guibutton>Adjuntar</guibutton>.  Si presiona el\n"
-"\t    botón <guibutton>Adjuntar</guibutton>,\n"
-"\t    <application>Evolution</application> abrirá una ventana de selección\n"
-"\t    de archivos para preguntarle que archivo quiere enviar.\n"
-"\t    Seleccione el archivo y pulse <guilabel>Aceptar</guilabel>.\n"
-"        </para>\n"
-
-#: tmp/usage-mail.sgml.h:198
-msgid ""
-"\t<para>\n"
-"\t   <application>Evolution</application> can also display\n"
-"\t   HTML-formatted mail, complete with graphics.  HTML\n"
-"\t   formatting will display automatically, although you can\n"
-"\t   turn it off if you prefer.\n"
-"\t</para>\n"
-msgstr ""
-"\t<para>\n"
-"\t   <application>Evolution</application> tambien puede mostrar\n"
-"\t   correo formateado en HTML, completo con gráficos.  El formateado\n"
-"\t   en HTML se mostrará automaticamente, aunque puede deshabilitarlo\n"
-"\t   si lo prefiere.\n"
-"\t</para>\n"
-
-#: tmp/usage-mail.sgml.h:205
-msgid ""
-"\t<para>\n"
-"\t   Evolution will send mail immediately unless you tell it to\n"
-"\t   do otherwise by selecting <menuchoice>\n"
-"\t   <guimenu>File</guimenu> <guimenuitem>Send\n"
-"\t   Later</guimenuitem></menuchoice>.  This will add your\n"
-"\t   messages to the <guilabel>Outbox</guilabel> queue.  Then,\n"
-"\t   when you press <guibutton>Send</guibutton> in another\n"
-"\t   message, or <guibutton>Get Mail</guibutton> in the main\n"
-"\t   mail window, all your unsent messages will go out at once.\n"
-"\t   I like to use \"Send Later\" because it gives me a chance to\n"
-"\t   change my mind about a message before it goes out.  That\n"
-"\t   way, I don't send anything I'll regret the next day.\n"
-"\t</para>\n"
-msgstr ""
-"\t<para>\n"
-"\t   Evolution enviará el mensaje inmediatamente a menos que le diga lo\n"
-"\t   contrario seleccionando <menuchoice>\n"
-"\t   <guimenu>Archivo</guimenu> <guimenuitem>Enviar más\n"
-"\t   Tarde</guimenuitem></menuchoice>.  Esto añadirá sus mensajes\n"
-"\t   a la cola de <guilabel>Outbox</guilabel>.  Esntonces,\n"
-"\t   cuando pulse <guibutton>Enviar</guibutton> en otro\n"
-"\t   mensaje, u <guibutton>Obtener</guibutton> en la ventana principal\n"
-"\t   del correo, todos los mensajes no enviados se enviarán en ese momento.\n"
-"\t   Me gusta usar \"Enviar más Tarde\" porque me permite tener la "
-"oportunidad\n"
-"\t   de cambiar de opinión acerca de un mensaje antes de enviarlo.  De esa "
-"forma\n"
-"\t   no envio nada de lo que me arrepentiré al día siguiente.\n"
-"\t</para>\n"
-
-#: tmp/usage-mail.sgml.h:219
-msgid ""
-"\t<para>\n"
-"\t   To learn more about how you can specify message queue and\n"
-"\t   filter behavior, see <xref linkend=\"config-prefs-mail\">.\n"
-"\t</para>\n"
-msgstr ""
-"\t   Para aprender más acerca de como puede especificar el comportamiento "
-"de\n"
-"\t   la cola de mensajes y de los filtros, vea <xref linkend=\"config-prefs-"
-"mail\">.\n"
-"\t</para>\n"
-
-#: tmp/usage-mail.sgml.h:224
-msgid ""
-"\t<para>\n"
-"\t   To organize my mail box, I set up a virtual folder for\n"
-"\t   emails from my friend and co-worker Anna.  I have another\n"
-"\t   one for messages that have \"ximian.com\" in the address and\n"
-"\t   \"Evolution\" in the subject line, so I can keep a record of\n"
-"\t   what people from work send me about\n"
-"\t   <application>Evolution</application>.  If Anna sends me a\n"
-"\t   message about anything other than Evolution, it only shows\n"
-"\t   up in the \"Anna\" folder. When Anna sends me mail about the\n"
-"\t   user interface for <application>Evolution</application>, I\n"
-"\t   can see that message both in the \"Anna\" virtual folder and\n"
-"\t   in the \"Internal Evolution Discussion\" virtual folder.\n"
-"\t</para>\n"
-msgstr ""
-"\t<para>\n"
-"\t   Para organizar el correo en mi buzón, defino una carpeta virtual para\n"
-"\t   los mensajes de mi amiga y compañera Anna.  Tengo otra para los\n"
-"\t   los mensajes que tienen \"ximian.com\" en la dirección y \"Evolution\"\n"
-"\t   en el asunto, así puedo registrar que personas del trabajo me escriben\n"
-"\t   acerca de <application>Evolution</application>. Si Anna me envía un\n"
-"\t   mensaje acerca de cualquier cosa excepto Evolution, solo aparece\n"
-"\t   en la carpeta \"Anna\". Cuando Anna me escribe acerca de la interfaz\n"
-"\t   de usuario de <application>Evolution</application>, puedo ver ese\n"
-"\t   mensaje en la carpeta virtual \"Anna\" y en la carpeta virtual\n"
-"\t   \"Discusión Interna sobre Evolution\".\n"
-"\t</para>\n"
-
-#: tmp/usage-mail.sgml.h:238
-msgid ""
-"\t<para>\n"
-"\t   To reply to a message, press the\n"
-"\t   <guibutton>Reply</guibutton> button while it is selected,\n"
-"\t   or choose <guimenuitem>Reply to Sender</guimenuitem> from\n"
-"\t   the message's right-click menu.  That will open the\n"
-"\t   <interface>message composer</interface>.  The\n"
-"\t   <guilabel>To:</guilabel> and <guilabel>Subject</guilabel>\n"
-"\t   fields will already be filled, although you can alter them\n"
-"\t   if you wish.  In addition, the full text of the old message\n"
-"\t   is inserted into the new message, either in italics (for\n"
-"\t   HTML display) or with the &gt; character before each line\n"
-"\t   (in plain text mode), to indicate that it's part of the\n"
-"\t   previous message.  People often intersperse their message\n"
-"\t   with the quoted material as shown in <xref\n"
-"\t   linkend=\"usage-mail-getnsend-reply-fig\">.\n"
-"\n"
-"<!-- note that this figure should have a reply message ready to send,\n"
-"with quoted materials and the relevant replies interspersed-->\n"
-" <!-- ==============Figure=================================== -->\n"
-"       <figure id=\"usage-mail-getnsend-reply-fig\">\n"
-"\t <title>Reply Message Window</title>\n"
-"\t <screenshot>\n"
-"\t  <screeninfo>Evolution Main Window</screeninfo>\n"
-"\t  <graphic fileref=\"fig/replymsg\" format=\"png\" srccredit=\"Aaron Weber"
-"\">\n"
-"\t</graphic>\n"
-"\t</screenshot>\n"
-"      </figure>\n"
-"<!-- ==============End of Figure=================================== -->\n"
-"\t</para>\n"
-msgstr ""
-"\t<para>\n"
-"\t   Para resonder a un mensaje, pulse el botón\n"
-"\t   <guibutton>Responder</guibutton> mientras está seleccionado,\n"
-"\t   o elija <guimenuitem>Responder al Remitente</guimenuitem> del menu\n"
-"\t   del botón derecho del mensaje.  Esto abrirá el\n"
-"\t   <interface>compositor de mensajes</interface>.  Los campos\n"
-"\t   <guilabel>A:</guilabel> y <guilabel>Asunto</guilabel>\n"
-"\t   ya estarán escritos, aunque puede alterarlos si lo desea.\n"
-"\t   Ademas, el texto completo del antiguo mensaje es insertado en el\n"
-"\t   nuevo mensaje, bien sea con itálicas (para vista en HTML) o con el\n"
-"\t   caracter &gt; precediendo cada línea (en modo texto plano), para\n"
-"\t   indicar que es parte del mensaje previo.  Habitualmente la gente\n"
-"\t   escribe su mensaje intercalado con el mensaje anterior, como se\n"
-"\t   muestra en <xref linkend=\"usage-mail-getnsend-reply-fig\">.\n"
-"\n"
-"<!-- note que esta imagen debe tener un mensaje de respuesta listo para ser\n"
-"enviado con partes quoteadas y las respuestas relevante intercaladas-->\n"
-" <!-- ==============Imagen=================================== -->\n"
-"       <figure id=\"usage-mail-getnsend-reply-fig\">\n"
-"\t <title>Ventana de Respuesta de Mensajes</title>\n"
-"\t <screenshot>\n"
-"\t  <screeninfo>Ventana Principal de Evolution</screeninfo>\n"
-"\t  <graphic fileref=\"fig/replymsg\" format=\"png\" srccredit=\"Aaron Weber"
-"\">\n"
-"\t</graphic>\n"
-"\t</screenshot>\n"
-"      </figure>\n"
-"<!-- ==============Fin de la Imagen=================================== -->\n"
-"\t</para>\n"
-
-#: tmp/usage-mail.sgml.h:268
-msgid ""
-"\t<para>\n"
-"\t  <itemizedlist>\n"
-"\t    <listitem><para>\n"
-"              Incoming email that your filters don't move goes into the "
-"Inbox; \n"
-"              outgoing mail that they don't move ends up in the Sent "
-"folder.\n"
-"             </para>\n"
-"\t    </listitem>\n"
-"\n"
-"\t    <listitem><para>If you move a folder, your filters\n"
-"\t    will follow it.  </para></listitem>\n"
-"\t  </itemizedlist>\n"
-"\t</para>\n"
-msgstr ""
-"\t<para>\n"
-"\t  <itemizedlist>\n"
-"\t    <listitem><para>\n"
-"              El correo de entrada que sus filtros no mueven va a la carpeta "
-"Inbox; \n"
-"              el correo de salida que no mueven acaba en la carpeta Sent.\n"
-"             </para>\n"
-"\t    </listitem>\n"
-"\n"
-"\t    <listitem><para>Si mueve una carpeta, sus filtros\n"
-"\t    la seguirán.  </para></listitem>\n"
-"\t  </itemizedlist>\n"
-"\t</para>\n"
-
-#: tmp/usage-mail.sgml.h:281
-msgid ""
-"\t<para>\n"
-"\t  I started with ten, but four were \"Don't send\n"
-"\t  <glossterm linkend=\"spam\">spam</glossterm>.\"\n"
-"\t  <itemizedlist>\n"
-"\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t\t Don't send spam or forward chain mail.  If you must,\n"
-"\t\t watch out for hoaxes and urban legends, and make sure\n"
-"\t\t the message doesn't have multiple layers of\n"
-"\t\t greater-than signs, (&gt;) indicating multiple layers\n"
-"\t\t of careless in-line forwarding.\n"
-"\t      </para>\n"
-"\t    </listitem>\n"
-"\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t\tAlways begin and close with a salutation. Say \"please\"\n"
-"\t\tand \"thank you,\" just like you do in real life. You\n"
-"\t\tcan keep your pleasantries short, but be pleasant!\n"
-"\t      </para>\n"
-"\t    </listitem>\n"
-"\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t\tALL CAPS MEANS YOU'RE SHOUTING! Don't write a whole\n"
-"\t\tmessage in capital letters.  It hurts people's ears.\n"
-"\t      </para>\n"
-"\t    </listitem>\n"
-"\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t\t Never write anything in email you wouldn't say in\n"
-"\t\t public.  Old messages have a nasty habit of\n"
-"\t\t resurfacing when you least expect.\n"
-"\t      </para>\n"
-"\t    </listitem>\n"
-"\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t       Check your spelling and use complete sentences.\n"
-"\t      </para>\n"
-"\t    </listitem>\n"
-"\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t\tDon't send nasty emails (flames).  If you get one,\n"
-"\t\tdon't write back.\n"
-"\t      </para>\n"
-"\t    </listitem>\n"
-"\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t\t When you reply or forward, include just enough of\n"
-"\t\t the previous message to provide context: not too\n"
-"\t\t much, not too little.\n"
-"\t       </para>\n"
-"\t    </listitem>\n"
-"\t  </itemizedlist>\n"
-"\t</para>\n"
-msgstr ""
-"\t<para>\n"
-"\t  Comenze con diez, pero cuatro eran \"No envie\n"
-"\t  <glossterm linkend=\"spam\">spam</glossterm>.\"\n"
-"\t  <itemizedlist>\n"
-"\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t\t No envie spam ni reenvie cartas encadenadas.  Si debe hacerlo,\n"
-"\t\t tenga cuidado con los timos y las leyendas urbanas, y asegurese\n"
-"\t\t que el mensaje no tiene múltiples capas de signos mayor que, (&gt;)\n"
-"\t\t indicando multiples capas de reenvios desconsiderados.\n"
-"\t      </para>\n"
-"\t    </listitem>\n"
-"\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t\tSiempre comienze y acabe con un saludo. Diga \"por favor\"\n"
-"\t\ty \"gracias\", tal como hace en la vida real. Puede mantener\n"
-"\t\tsu cortesía excasa, pero ¡sea cortes!\n"
-"\t      </para>\n"
-"\t    </listitem>\n"
-"\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t\t¡TODO EN MAYUSCULAS SIGNIFICA QUE ESTÁ GRITANDO! No escriba todo el\n"
-"\t\tmensaje en mayusculas.  Hace daño a los oidos de la gente.\n"
-"\t      </para>\n"
-"\t    </listitem>\n"
-"\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t\t Nunca escriba en un mensaje electrónico nada que no diría en público.\n"
-"\t\t Los mensajes antiguos tienen la mala costumbre de reaparecer cuando\n"
-"\t\t menos se lo espera.\n"
-"\t      </para>\n"
-"\t    </listitem>\n"
-"\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t       Compruebe su ortografía y use frases completas.\n"
-"\t      </para>\n"
-"\t    </listitem>\n"
-"\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t\tNo envie mensajes desagradebles (broncas).  Si recive uno,\n"
-"\t\tno lo conteste.\n"
-"\t      </para>\n"
-"\t    </listitem>\n"
-"\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t\t Cuando responde o reenvía, incluya justo lo suficiente del mensaje\n"
-"\t\t anterior para tener un contexto: no incluya demasiado,\n"
-"\t\t ni demasiado poco.\n"
-"\t       </para>\n"
-"\t    </listitem>\n"
-"\t  </itemizedlist>\n"
-"\t</para>\n"
-
-#: tmp/usage-mail.sgml.h:342
-msgid ""
-"\t<para>\n"
-"\t  If someone sends you an <glossterm>attachment</glossterm>, a\n"
-"\t  file attached to an email,\n"
-"\t  <application>Evolution</application> will display the file\n"
-"\t  at the bottom of the message to which it's attached.  Text,\n"
-"\t  HTML, and most images will be displayed within the message\n"
-"\t  itself.  For other files,\n"
-"\t  <application>Evolution</application> will show an icon at\n"
-"\t  the end of the message.  Right-click on the icon to get a\n"
-"\t  list of options which will vary depending on the type of\n"
-"\t  attachment. You will have the option to display most files\n"
-"\t  as part of the message, export them to a different\n"
-"\t  application (images to Eye of GNOME, spreadsheets to\n"
-"\t  Gnumeric, and so forth), or save them to disk.\n"
-"        </para>\n"
-msgstr ""
-"\t<para>\n"
-"\t  Si alguien le envía un <glossterm>adjunto</glossterm>, un\n"
-"\t  archivo adjunto aun mensaje,\n"
-"\t  <application>Evolution</application> mostrará en archivo en la\n"
-"\t  parte de abajo del mensaje al que está adjuntado.  Texto,\n"
-"\t  HTML, y la mayoría de imágenes se mostrarán dentro del mensaje.\n"
-"\t  Para otros archivos,\n"
-"\t  <application>Evolution</application> mostrará un icono al final\n"
-"\t  del mensaje.  Pulse con el botón derecho sobre el icono para obtener\n"
-"\t  una lista de opciones que variarán dependiendo del tipo de adjunto.\n"
-"\t  Tendrá la opción de mostrar la mayoría de los archivos como parte del\n"
-"\t  mensaje, exportarlos a otra aplicación (imágenes a Eye of GNOME, hojas\n"
-"\t  de cálculo a Gnumeric, y así sucesivamente), o guardarlo en el disco.\n"
-"        </para>\n"
-
-#: tmp/usage-mail.sgml.h:358
-msgid ""
-"\t<para>\n"
-"\t  If you have created address cards in the contact manager,\n"
-"\t  you can also enter nicknames or other portions of address\n"
-"\t  data, and <application>Evolution</application> will complete\n"
-"\t  the address for you. <!-- (INSERT description of UI for this\n"
-"\t  feature, once it is decided upon). --> If you enter a name\n"
-"\t  or nickname that can go with more than one card, Evolution\n"
-"\t  will open a dialog box to ask you which person you meant.\n"
-"\t  <!-- (NOT YET) Also, <application>Evolution</application>\n"
-"\t  will add a domain to any unqualified addresses.  By default,\n"
-"\t  this is your domain, but you can choose which one mail\n"
-"\t  preferences dialog. -->\n"
-"          </para>\n"
-msgstr ""
-"\t<para>\n"
-"\t  Si ha creado tarjetas de direcciones en el administrador de contactos,\n"
-"\t  puede escribir apodos o otras porciones de los datos de la dirección, y\n"
-"\t  <application>Evolution</application> completará la dirección por usted\n"
-"\t  <!-- (INSERTAR descripción de la IU para esta caracteristica,\n"
-"\t  una vez que se decida). --> Si escribe un nombre oun apodo\n"
-"\t  puede coincidir con más de una tarjeta, Evolution abrirá una ventana de\n"
-"\t  diálogo y le preguntará a quien se refiere.\n"
-"\t  <!-- (TODAVIA NO) Tambien, <application>Evolution</application>\n"
-"\t  añadirá un dominio a cualquier direccion incompleta.  Por defecto, será\n"
-"\t  su dominio, pero puede elegirlo en el diálogo de preferencias del\n"
-"\t  correo. -->\n"
-"          </para>\n"
-
-#: tmp/usage-mail.sgml.h:372
-msgid ""
-"\t<para>\n"
-"\t  If you're reading a message with several recipients, you may\n"
-"\t   wish to use <guibutton>Reply to All</guibutton> instead of\n"
-"\t   <guibutton>Reply</guibutton>.  If there are large numbers\n"
-"\t   of people in the <guilabel>Cc:</guilabel> or\n"
-"\t   <guilabel>To:</guilabel> fields, this can save substantial\n"
-"\t   amounts of time. \n"
-"\t  <example>\n"
-"\t    <title>Using the Reply to All feature</title>\n"
-"\t    <para>\n"
-"\t      Susan sends an email to a client and sends copies to Tim\n"
-"\t      and to an internal company mailing list of co-workers.\n"
-"\t      If Tim wants to make a comment for all of them to read,\n"
-"\t      he uses <guibutton>Reply to All</guibutton>, but if he\n"
-"\t      just wants to tell Susan that he agrees with her, he\n"
-"\t      uses <guibutton>Reply</guibutton>.  Note that his reply\n"
-"\t      will not reach anyone that Susan put on her\n"
-"\t      <guilabel>Bcc</guilabel> list, since that list is not\n"
-"\t      shared with anyone.\n"
-"\t    </para>\n"
-"\t  </example>\n"
-"\t</para>\n"
-msgstr ""
-"\t<para>\n"
-"\t  Si está leyendo un mensaje con varios destinatarios, puede usar\n"
-"\t   <guibutton>Responder a Todos</guibutton> en lugar de\n"
-"\t   <guibutton>Responder</guibutton>.  Si hay gran cantidad de personas\n"
-"\t   en los campos <guilabel>Cc:</guilabel> o <guilabel>A:</guilabel>,\n"
-"\t   esto puede ahorrar cantidades de tiempo sustanciales.\n"
-"\t  <example>\n"
-"\t    <title>Usando opción Responder a Todos</title>\n"
-"\t    <para>\n"
-"\t      Susan envía un correo a un cliente y envía copias a Tim\n"
-"\t      y a una lista de correo interno de la compañía.\n"
-"\t      Si Tim quiere hacer un comentário para que lo lean todos, usa\n"
-"\t      <guibutton>Responder a Todos</guibutton>, pero si solo quiere\n"
-"\t      decirle a Susan que está de acuerdo con ella, usa\n"
-"\t      <guibutton>Responder</guibutton>.  Note que su respuesta no llegará\n"
-"\t      a ninguna de las personas que Susan puso en su lista\n"
-"\t      <guilabel>Cco</guilabel>, dado que esa lista no es compartida con\n"
-"\t      nadie.\n"
-"\t    </para>\n"
-"\t  </example>\n"
-"\t</para>\n"
-
-#: tmp/usage-mail.sgml.h:395
-msgid ""
-"\t<para>\n"
-"\t  The post office forwards your mail for you when you change\n"
-"\t  addresses, and you can forward mail when you get a letter by\n"
-"\t  mistake.  The email <guilabel>Forward</guilabel> button\n"
-"\t  works in much the same way.  It's particularly useful if you\n"
-"\t  have received a message and you think someone else would\n"
-"\t  like to see it.  You can forward a message as an attachment\n"
-"\t  to a new message (this is the default) or\n"
-"\t  you can send it <glossterm linkend=\"inline\">inline</glossterm> as a "
-"quoted\n"
-"\t  portion of the message you are sending.  Attachment\n"
-"\t  forwarding is best if you want to send the full, unaltered\n"
-"\t  message on to someone else.  Inline forwarding is best if\n"
-"\t  you want to send portions of a message, or if you have a\n"
-"\t  large number of comments on different sections of the\n"
-"\t  message you are forwarding.  Remember to note from whom the\n"
-"\t  message came, and where, if at all, you have removed or\n"
-"\t  altered content.\n"
-"\t</para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:414
-msgid ""
-"\t<para>\n"
-"\t  To forward a message you are reading, press\n"
-"\t  <guibutton>Forward</guibutton> on the toolbar, or select\n"
-"\t  <menuchoice> <guimenu>Message</guimenu>\n"
-"\t  <guimenuitem>Forward</guimenuitem> </menuchoice>.  If you\n"
-"\t  prefer to forward the message <glossterm linkend=\"inline\">inline</"
-"glossterm>\n"
-"\t  instead of attached, select <menuchoice>\n"
-"\t  <guimenu>Message</guimenu> <guimenuitem>Forward\n"
-"\t  Inline</guimenuitem> </menuchoice> from the menu.  Choose an\n"
-"\t  addressee as you would when sending a new message; the\n"
-"\t  subject will already be entered, but you can alter it.\n"
-"\t  Enter your comments on the message in the\n"
-"\t  <interface>composition frame</interface>, and press\n"
-"\t  <guibutton>Send</guibutton>.\n"
-"\t</para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:430
-msgid ""
-"\t<para>\n"
-"            For all of these menu items, you can choose whether or not\n"
-"            to <guilabel>Search Backwards</guilabel> in the document\n"
-"            from the point where your cursor is.  For all but the\n"
-"            regular expression search (which doesn't need it), you are\n"
-"            offered a check box to determine whether the search is to\n"
-"            be <guilabel>Case Sensitive</guilabel> when it determines\n"
-"            a match.\n"
-"        </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:440
-msgid ""
-"\t<para>\n"
-"            Normally, you can't set text styles or insert pictures in\n"
-"            emails, which is why you've probably seen people use far\n"
-"            too many exclamation points for emphasis, or use\n"
-"            <glossterm linkend=\"emoticon\">emoticons</glossterm> to\n"
-"            convey their feelings.  However, most newer email programs\n"
-"            can display images and text styles as well as basic\n"
-"            alignment and paragraph formatting. They do this with\n"
-"            <glossterm linkend=\"html\">HTML</glossterm>, just like web\n"
-"            pages do.\n"
-"        </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:452
-msgid ""
-"\t<para>\n"
-"            To hide the display of files you've attached to the\n"
-"            message, select <menuchoice>\n"
-"            <guimenu>View</guimenu> <guimenuitem>Hide\n"
-"            Attachments</guimenuitem> </menuchoice>; to show them\n"
-"            again, choose <guimenuitem>Show Attachments</guimenuitem>.\n"
-"        </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:460
-msgid ""
-"\t<para>\n"
-"            When you send the message, a copy of the attached file\n"
-"\t    will go with it.  Be aware that big attachments can take a\n"
-"\t    long time to download.\n"
-"          </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:466
-msgid ""
-"\t<para>\n"
-"           <variablelist>\n"
-"\t    <varlistentry>\n"
-"\t      <term><guimenuitem>Find</guimenuitem></term>\n"
-"\t      <listitem><para> Enter a word or phrase, and\n"
-"\t      <application>Evolution</application> will find it\n"
-"              in your message.\n"
-"\t      </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\t    \n"
-"\t    <varlistentry>\n"
-"\t      <term><guimenuitem>Find Regex</guimenuitem></term>\n"
-"\t      <listitem>\n"
-"\t\t<para>\n"
-"                  Find a regex, also called a\n"
-"                  <glossterm linkend=\"regular-expression\">regular\n"
-"                  expression</glossterm>, in your composer window.\n"
-"               </para>\n"
-"             </listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t    <varlistentry>\n"
-"\t      <term><guimenuitem>Find Again</guimenuitem></term>\n"
-"\t      <listitem><para>\n"
-"                   Select this item to repeat the last search you "
-"performed.\n"
-"              </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t    <varlistentry>\n"
-"\t       <term><guimenuitem>Replace</guimenuitem></term>\n"
-"\t       <listitem><para> \n"
-"                 Find a word or phrase, and replace it with\n"
-"\t         something else.  \n"
-"               </para></listitem>\n"
-"\t    </varlistentry>\n"
-"\n"
-"\t  </variablelist>\n"
-"        </para>  \n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:505
-msgid ""
-"\t<para>\n"
-"           HTML formatting tools are located in the toolbar just above\n"
-"\t   the space where you'll actually compose the message, and\n"
-"\t   they also appear in the <guimenu>Insert</guimenu> and\n"
-"\t   <guimenu>Format</guimenu> menus.  \n"
-"\t  </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:512
-msgid ""
-"\t<para>\n"
-"           There are three tools that you can find only in the\n"
-"           <guimenu>Insert</guimenu> menu.\n"
-"           <variablelist>\n"
-"             <varlistentry>\n"
-"               <term><guimenuitem>Insert Link</guimenuitem>:</term>\n"
-"\t       <listitem>\n"
-"\t        <para>\n"
-"                  Use this tool to put hyperlinks in your HTML\n"
-"                  messages.  When you select it,\n"
-"                  <application>Evolution</application> will prompt you\n"
-"                  for the <guilabel>Text</guilabel> that will appear,\n"
-"                  and the <guilabel>Link</guilabel>, where you should\n"
-"                  enter the actual web address (URL). If you don't\n"
-"                  want special link text, you can just enter the address\n"
-"                  directly, and <application>Evolution</application>\n"
-"                  will recognize it as a link.\n"
-"               </para>\n"
-"\t    </listitem>\n"
-"          </varlistentry>\n"
-"          <varlistentry>\n"
-"            <term> <guimenuitem>Insert Image</guimenuitem>:</term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"               Select this item to embed an image into your email, as\n"
-"               was done in the welcome message.  Images will appear at\n"
-"               the location of the cursor. This is different from\n"
-"               attaching them to a message, but not very different.\n"
-"              </para>\n"
-"\t    </listitem>\n"
-"           </varlistentry>\n"
-"          <varlistentry>\n"
-"             <term><guimenuitem>Insert Rule</guimenuitem>:</term>\n"
-"             <listitem><para>\n"
-"               This will insert a horizontal line, or rule, into your "
-"document.\n"
-"               You'll be presented with a dialog box which gives you\n"
-"               the choice of size, percentage of screen, shading, and\n"
-"               alignment; if you leave everything at the default\n"
-"               values you'll get a thin black rule all the way across\n"
-"               the screen.</para></listitem>\n"
-"\t</varlistentry>\n"
-"\n"
-"\t  </variablelist>\n"
-"          </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:557
-msgid ""
-"\t<para>\n"
-"           You can also choose to save messages as drafts or as text\n"
-"           files.  Choose\n"
-"           <menuchoice>\n"
-"             <guimenu>File</guimenu>\n"
-"             <guimenuitem>Save</guimenuitem>\n"
-"\t  </menuchoice>\n"
-"          or <guimenuitem>Save As</guimenuitem> to save your message\n"
-"          as a text file. If you prefer to keep your message in a\n"
-"          folder (the <guilabel>Drafts</guilabel> folder would be the\n"
-"          obvious place), you can select <menuchoice>\n"
-"          <guimenu>File</guimenu> <guimenuitem>Save In\n"
-"          Folder</guimenuitem> </menuchoice>. \n"
-"        </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:572
-msgid ""
-"\t<para>\n"
-"           You're probably familiar with search and replace features,\n"
-"           and if you come from a Linux or Unix background, you\n"
-"           probably know what <guimenuitem>Find Regex</guimenuitem>\n"
-"           does.  If you aren't among the lucky who already know,\n"
-"           here's a quick rundown of an important section of the\n"
-"           <guimenu>Edit</guimenu> menu.\n"
-"        </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:581
-msgid ""
-"\t<para>\n"
-"          One of the ways <application>Evolution</application> lets\n"
-"          you choose the way you work is the way it lets you sort your\n"
-"          message lists.  To sort by sender, subject, or date, click\n"
-"          on the bars with those labels at the top of the message\n"
-"          list. The direction of the arrow next to the label indicates\n"
-"          the direction of the sort, and if you click again, you'll\n"
-"          sort them in reverse order. For example, click once on\n"
-"          <guilabel>Date</guilabel> to sort messages by date from\n"
-"          oldest to newest.  Click again, and\n"
-"          <application>Evolution</application> sorts the list from\n"
-"          newest to oldest. You can also right-click on the message\n"
-"          header bars to get a set of sorting options, and add or\n"
-"          remove columns from the message list.  You can find detailed\n"
-"          instructions on how to customize your message display\n"
-"          columns in <xref linkend=\"usage-mail-organize-columns\">.\n"
-"        </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:599
-msgid ""
-"\t<para>\n"
-"          You can also choose a threaded message view. Select\n"
-"          <menuchoice> <guimenu>View</guimenu>\n"
-"          <guimenuitem>Threaded</guimenuitem> </menuchoice> to turn\n"
-"          the threaded view on or off.  When you select this option,\n"
-"          <application>Evolution</application> groups the replies to a\n"
-"          message with the original, so you can follow the thread of a\n"
-"          conversation from one message to the next.\n"
-"        </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:609
-msgid "\t<para> Happy mailing! </para>\n"
-msgstr "\t<para> ¡Feliz envío de correo! </para>\n"
-
-#: tmp/usage-mail.sgml.h:611
-msgid "\t<title>Attachments and HTML Mail</title>\n"
-msgstr "\t<title>Adjuntos y correo en HTML</title>\n"
-
-#: tmp/usage-mail.sgml.h:613
-msgid "\t<title>Attachments</title>\n"
-msgstr "\t<title>Adjuntos</title>\n"
-
-#: tmp/usage-mail.sgml.h:615
-msgid "\t<title>Choosing Recipients Quickly</title>\n"
-msgstr "\t<title>Eligiendo Rápidamente a los Destinatarios</title>\n"
-
-#: tmp/usage-mail.sgml.h:617
-msgid "\t<title>Embellish your email with HTML</title>\n"
-msgstr "\t<title>Embelleciendo su correo con HTML</title>\n"
-
-#: tmp/usage-mail.sgml.h:619
-msgid "\t<title>Forwarding Mail</title>      \n"
-msgstr "\t<title>Reenviando Correo</title>      \n"
-
-#: tmp/usage-mail.sgml.h:621
-msgid "\t<title>New Message Window</title>\n"
-msgstr "\t<title>Ventana de Nuevo Mensaje</title>\n"
-
-#: tmp/usage-mail.sgml.h:623
-msgid "\t<title>Replying to Messages</title>\n"
-msgstr "\t<title>Respondiendo Mensajes</title>\n"
-
-#: tmp/usage-mail.sgml.h:625
-msgid "\t<title>Saving Messages for Later</title>\n"
-msgstr "\t<title>Guardando Mensajes para más tarde</title>\n"
-
-#: tmp/usage-mail.sgml.h:627
-msgid "\t<title>Seven Tips for Email Courtesy</title>\n"
-msgstr "\t<title>Siete Consejos de Cortesía en el Correo</title>\n"
-
-#: tmp/usage-mail.sgml.h:629
-msgid "\t<title>Sorting the message list</title>\n"
-msgstr "\t<title>Ordenando la lista de mensajes</title>\n"
-
-#: tmp/usage-mail.sgml.h:631
-msgid "\t<title>Two Notable Filter Features</title>\n"
-msgstr "\t<title>Dos Características Notables de los Filtros</title>\n"
-
-#: tmp/usage-mail.sgml.h:633
-msgid "\t<title>Using Folders, Searches, and Virtual Folders</title>\n"
-msgstr "\t<title>Usando Carpetas, Búsquedas, y Carpetas Virtuales</title>\n"
-
-#: tmp/usage-mail.sgml.h:635
-msgid ""
-"         <para>\n"
-"\t    The simplest way to direct a message is to put the email\n"
-"            address or addresses in the <guilabel>To:</guilabel>\n"
-"            field, which denotes primary recipients.  To send mail to\n"
-"            more than one or two people, you can use the the\n"
-"            <guilabel>Cc:</guilabel> field.\n"
-"\t  </para>\n"
-msgstr ""
-"         <para>\n"
-"\t    La manera más simple de dirigir un mensaje es poner la dirección\n"
-"           o direcciones de correo en el campo <guilabel>A:</guilabel>,\n"
-"           el cual denota a los destinatarios principales.  Para enviar\n"
-"           correo a más de una o dos personas, puede usar el campo\n"
-"            <guilabel>Cc:</guilabel>.\n"
-"\t  </para>\n"
-
-#: tmp/usage-mail.sgml.h:643
-msgid "         <title>Types of Recipients</title>\n"
-msgstr "         <title>Tipos de Destinatarios</title>\n"
-
-#: tmp/usage-mail.sgml.h:645
-msgid "         <title>Using Evolution for News </title>\n"
-msgstr "         <title>Usando Evolution para las Noticias </title>\n"
-
-#: tmp/usage-mail.sgml.h:647
-msgid ""
-"        <para>\n"
-"\t    <application>Evolution</application>, like most email\n"
-"\t    programs recognizes three types of addressee: primary\n"
-"\t    recipients, secondary recipients, and hidden (\"blind\")\n"
-"\t    recipients.\n"
-"         </para>\n"
-msgstr ""
-"        <para>\n"
-"\t    <application>Evolution</application>, como la mayoría de\n"
-"\t    los programas de correo reconoce tres tipos de direcciones\n"
-"\t    destinatarios principales, destinatarios secundarios, y\n"
-"\t    destinatarios escondidos (\"oculto\").\n"
-"         </para>\n"
-
-#: tmp/usage-mail.sgml.h:654
-msgid ""
-"        <para>\n"
-"\t  You can probably guess the purpose of the buttons labelled\n"
-"\t  <guibutton>Cut</guibutton>, <guibutton>Copy</guibutton>,\n"
-"\t  <guibutton>Paste</guibutton>, <guibutton>Undo</guibutton>\n"
-"\t  and <guibutton>Redo</guibutton>, but there's a bit more to\n"
-"\t  sending mail that's less obvious.  In the next few sections,\n"
-"\t  you'll see how <application>Evolution</application> handles\n"
-"\t  additional features, including large recipient lists,\n"
-"\t  attachments, and forwarding.\n"
-"        </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:665
-msgid ""
-"        <para>\n"
-"          If you change your mind and decide you want to keep it,\n"
-"          select <menuchoice> <guimenu>Message</guimenu>\n"
-"          <guimenuitem>Undelete</guimenuitem></menuchoice>.  If you\n"
-"          really want to get rid of it, choose\n"
-"          <guimenuitem>Expunge</guimenuitem> from the\n"
-"          <guimenu>Folder</guimenu> menu.  That will delete it\n"
-"          permanently.\n"
-"        </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:675
-msgid ""
-"        <para>\n"
-"          Once you've read your mail, you may want to get rid of\n"
-"          it. To mark a message for deletion, select it in the the\n"
-"          <interface>message list</interface> by clicking on it once.\n"
-"          Then click on the <guibutton>Delete</guibutton> button in\n"
-"          the tool bar. Or, right-click on a message and choose\n"
-"          <guimenuitem>Delete</guimenuitem> from the right-click\n"
-"          menu. The message will appear with a line through it, to\n"
-"          show that you've marked it for deletion.\n"
-"        </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:686
-msgid ""
-"        <para>\n"
-"        Now, tell it what to do with those messages.  If you want more\n"
-"        actions, click <guibutton>Add Action</guibutton>; if you want\n"
-"        fewer, click <guibutton>Remove Action</guibutton>.  And choose\n"
-"        again:\n"
-"        <variablelist>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Copy to Folder</guilabel></term>\n"
-"\t    <listitem><para>\n"
-"               If you select this item, <application>Evolution</"
-"application>\n"
-"               will put the messages into a folder you specify.  Click the \n"
-"               <guibutton>&lt;click here to select a folder&gt;</guibutton> "
-"button\n"
-"               to select a folder. \n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Move to Folder</guilabel></term>\n"
-"\t    <listitem><para>\n"
-"               If you select this item, <application>Evolution</"
-"application>\n"
-"               will put the messages into a folder you specify.  Click the \n"
-"               <guibutton>&lt;click here to select a folder&gt;</guibutton> "
-"button\n"
-"               to select a folder. \n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Forward to Address</guilabel></term>\n"
-"\t    <listitem><para>\n"
-"                Select this, enter an address, and the addressee will\n"
-"                get a copy of the message.\n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Delete</guilabel></term>\n"
-"\t    <listitem><para>\n"
-"                Marks the message for deletion.  You can still get the "
-"message\n"
-"                back, at least until you <guimenuitem>Expunge</guimenuitem> "
-"your\n"
-"                mail yourself.\n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Stop Processing</guilabel></term>\n"
-"\t    <listitem><para>\n"
-"              Select this if you want to tell all other filters to ignore \n"
-"              this message, because whatever you've done with it so far\n"
-"              is plenty.\n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Assign Color</guilabel></term>\n"
-"\t    <listitem><para>\n"
-"                Select this item, and <application>Evolution</application>\n"
-"                will mark the message with whatever color you please.\n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Assign Score</guilabel></term>\n"
-"\t    <listitem><para> If you know that all mail with\n"
-"\t    \"important\" somewhere in the message body line is\n"
-"\t    important, you can give it a high priority score. In a subsequent "
-"filter you can \n"
-"            then arrange your messages by their priority score.\n"
-"\t  </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t</variablelist>\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:759
-msgid "        <title>Advanced Mail Composition</title>\n"
-msgstr "        <title>Composición Avanzada de Correo</title>\n"
-
-#: tmp/usage-mail.sgml.h:761
-msgid "        <title>Deleting Mail</title>\n"
-msgstr "        <title>Borrando Correo</title>\n"
-
-#: tmp/usage-mail.sgml.h:763
-msgid "        <title>Searching and Replacing with the Composer</title>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:765
-msgid ""
-"       <para>\n"
-"         Newsgroups are so similar to email that there's no reason not\n"
-"         to read them side by side.  If you want to do that, add a\n"
-"         news source to your configuration (see <xref\n"
-"         linkend=\"config-prefs-network-news\">). The news server will\n"
-"         appear as a remote server, and will look quite similar to an\n"
-"         IMAP folder.  When you click <guibutton>Get Mail</guibutton>,\n"
-"         <application>Evolution</application> will also check for news\n"
-"         messages.\n"
-"       </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:776
-msgid ""
-"       <para>\n"
-"         The second part, however, is slightly different.  In the\n"
-"         section of the window labelled <guilabel>Virtual Folder Sources\n"
-"         </guilabel> is a list of folders in which\n"
-"         <application>Evolution</application> will search for the\n"
-"         contents of your vFolder.  Click <guibutton>Add</guibutton>\n"
-"         to add a folder, or <guibutton>Remove</guibutton> to remove\n"
-"         one.  That way, you can have your vFolder search in\n"
-"         newsgroups, or just in one of your mailboxes, or just in a\n"
-"         select few folders you've already screened with filters.\n"
-"       </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:788
-msgid ""
-"       <para>\n"
-"        The vFolder creation window is shown in <xref\n"
-"\tlinkend=\"usage-mail-vfolder-fig-createrule\">\n"
-"\n"
-"       <figure id=\"usage-mail-vfolder-fig-createrule\">\n"
-"\t <title>Selecting a vFolder Rule</title>\n"
-"\t <screenshot>\n"
-"\t  <screeninfo>Creating a vFolder Rule</screeninfo>\n"
-"\t  <graphic fileref=\"fig/vfolder-createrule-fig\" format=\"png\" srccredit="
-"\"Aaron Weber\">\n"
-"\t</graphic>\n"
-"\t</screenshot>\n"
-"      </figure>\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:802
-msgid ""
-"      <para>\n"
-"\t Enter an address in the <guilabel>To:</guilabel> field, a\n"
-"\t subject in the <guilabel>Subject:</guilabel> and a message in\n"
-"\t the big empty box at the bottom of the window, and press\n"
-"\t <guibutton>Send</guibutton>.\n"
-"       </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:809
-msgid ""
-"      <para>\n"
-"\t To create a virtual folder, select <menuchoice>\n"
-"\t <guimenu>Settings</guimenu> <guimenuitem>Virtual Folder\n"
-"\t Editor</guimenuitem> </menuchoice>.  This will bring up a\n"
-"\t dialog box that looks suspiciously like the filter window\n"
-"\t (for more information on filters, see <xref\n"
-"\t linkend=\"usage-mail-organize-filters\">), and which\n"
-"\t presents you with a list of virtual folders you have previously\n"
-"\t created. If you have created any virtual folders, they are listed\n"
-"\t here, and you can select, edit or remove them if you wish.\n"
-"\t If you have not created any, there will be only one available\n"
-"\t option: click <guibutton>Add</guibutton> to add a new\n"
-"\t Virtual Folder.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:824
-msgid ""
-"      <para>\n"
-"\t You can enter a name for your virtual folder in the\n"
-"\t <guilabel>Name</guilabel>.  Then, tell\n"
-"\t <application>Evolution</application> what messages to look\n"
-"\t for.  This process is exactly like filter creation: decide\n"
-"\t between <guilabel>Match all parts</guilabel> and\n"
-"\t <guilabel>Match any part</guilabel>, then choose what part of\n"
-"\t the message to look in, what sort of matching to perform, and\n"
-"\t specify exactly what it is that you want to find, be it a\n"
-"\t line of text, a score, a regular expression, or a particular date or\n"
-"\t range of dates.\n"
-"       </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:837
-msgid ""
-"      <para>\n"
-"\t You can start writing a new email message by selecting\n"
-"\t <menuchoice> <guimenu>File</guimenu>\n"
-"\t <guisubmenu>New</guisubmenu> <guimenuitem>\n"
-"\t Mail Message</guimenuitem></menuchoice>, or by pressing the\n"
-"\t <guibutton>Compose</guibutton> button in the Inbox toolbar.\n"
-"\t When you do so, the <interface>New Message</interface> window\n"
-"\t will open, as shown in <xref\n"
-"\t linkend=\"usage-mail-newmsg-fig\">.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:848
-msgid ""
-"      <para>\n"
-"\t<application>Evolution</application> keeps mail, as well as\n"
-"\taddress cards and calendars, in folders.  You start out with a\n"
-"\tfew, like <guilabel>Inbox</guilabel>,\n"
-"\t<guilabel>Outbox</guilabel>, and <guilabel>Drafts</guilabel>,\n"
-"\tbut you can create as many as you like.  Create new folders by\n"
-"\tselecting <guisubmenu>New</guisubmenu> and then\n"
-"\t<guimenuitem>Folder</guimenuitem> from the\n"
-"\t<guimenu>File</guimenu> menu.\n"
-"\t<application>Evolution</application> will as you for the name\n"
-"\tand the type of the folder, and will provide you with a folder\n"
-"\ttree so you can pick where it goes.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:862
-msgid ""
-"      <para>\n"
-"\tA virtual folder is really a hybrid of all the other organizational\n"
-"\ttools: it looks like a folder, it acts like a search, and you\n"
-"\tset it up like a filter.  In other words, while a conventional\n"
-"\tfolder actually contains messages, a virtual folder is a view of\n"
-"\tmessages that may be in several different folders.  The\n"
-"\tmessages it contains are determined on the fly using a set of\n"
-"\tcriteria you choose in advance.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:872
-msgid ""
-"      <para>\n"
-"\tAs messages that meet the virtual folder criteria arrive or are\n"
-"\tdeleted, <application>Evolution</application> will\n"
-"\tautomatically place them in and remove them from the\n"
-"\tvirtual folder contents list.  When you delete a message, it gets\n"
-"\terased from the folder in which it actually exists, as well as\n"
-"\tany virtual folders which display it.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:881
-msgid ""
-"      <para>\n"
-"\tIf filters aren't flexible enough for you, or you find\n"
-"\tyourself performing the same search again and again, consider\n"
-"\ta virtual folder. Virtual folders, or vFolders, are an\n"
-"\tadvanced way of viewing your email messages within\n"
-"\t<application>Evolution</application>.  If you get a lot of\n"
-"\tmail or often forget where you put messages, virtual folders can help\n"
-"\tyou stay on top of things.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:891
-msgid ""
-"      <para>\n"
-"\tImagine a business trying to keep track of mail from hundreds\n"
-"\tof vendors and clients, or a university with overlapping and\n"
-"\tchanging groups of faculty, staff, administrators and\n"
-"\tstudents.  The more mail you need to organize, the less you\n"
-"\tcan afford the sort of confusion that stems from an\n"
-"\torganizational system that's not flexible enough.  Virtual folders\n"
-"\tmake for better organization because they can accept\n"
-"\toverlapping groups in a way that regular folders and filing\n"
-"\tsystems can't.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:903
-msgid ""
-"      <para>\n"
-"\tMost mail clients can search through your messages for you,\n"
-"\tbut <application>Evolution</application> does it faster. You\n"
-"\tcan search through just the message subjects, just the message\n"
-"\tbody, or both body and subject.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:910
-msgid ""
-"      <para>\n"
-"\tNow that you've had a look around the\n"
-"\t<interface>Inbox</interface>, it's time to check for new mail.\n"
-"\tClick <guibutton>Get mail</guibutton> in the toolbar to check\n"
-"\tyour mail.  If it's the first time you've done so, the\n"
-"\t<interface>mail setup assistant</interface> will ask you for\n"
-"\tthe information it needs to check your mail (see <xref\n"
-"\tlinkend=\"config-setupassist\"> for more information). \n"
-"     </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:920
-msgid ""
-"      <para>\n"
-"\tTo start searching, enter a word or phrase in the text area\n"
-"\tright below the toolbar, and choose a search type:\n"
-"\t<variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Body or subject contains:</guilabel></term>\n"
-"\t  <listitem>\n"
-"\t      <para>\n"
-"\t        This will search message subjects and the messages\n"
-"\t        themselves for the word or phrase you've entered in\n"
-"\t        the search field.\n"
-"   \t      </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t  <varlistentry>\n"
-"\t    <term> <guilabel>Body contains:</guilabel> </term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t        This will search only in message text, not the subject\n"
-"\t        lines.\n"
-"\t      </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Subject contains:</guilabel></term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t        This will show you messages where the search text is\n"
-"\t        in the subject line.  It will not search in the\n"
-"\t        message body.\n"
-"\t      </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Body does not contain:</guilabel></term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t        This finds every email message that does not have the\n"
-"\t        search text in the message body.  It will still show\n"
-"\t        messages that have the search text in the subject\n"
-"\t        line, if it is not also in the body.\n"
-"\t      </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Subject does not contain:</guilabel></term>\n"
-"\t    <listitem>\n"
-"\t      <para>\n"
-"\t        This finds every mail whose subject does not contain\n"
-"\t        the search text.\n"
-"\t      </para>\n"
-"\t    </listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"\n"
-"        When you've entered your search phrase, press\n"
-"        <keycap>Enter</keycap>.  <application>Evolution</application>\n"
-"        will show your search results in the message list.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:980
-msgid ""
-"      <para>\n"
-"\tYour <application>Evolution</application>\n"
-"\t<guilabel>Inbox</guilabel> will look something like the one in\n"
-"\t<xref linkend=\"usage-mail-intro-fig\">. Just below the toolbar\n"
-"\tis the <interface>message list</interface>, showing message\n"
-"\theader information like <guilabel>Subject</guilabel> and\n"
-"\t<guilabel>Date</guilabel>.  The message itself appears below\n"
-"\tthat, in the <interface>view pane</interface>.  If you find\n"
-"\tthe <interface>view pane</interface> too small, you can resize\n"
-"\tthe pane, enlarge the whole window, or double-click on the\n"
-"\tmessage in the <interface>message list</interface> to have it\n"
-"\topen in a new window.  Just like with folders, you can\n"
-"\tright-click on messages in the message list and get a menu of\n"
-"\tpossible actions.\n"
-"     </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:996
-msgid ""
-"      <para>\n"
-"         <application>Evolution</application> lets you handle your\n"
-"         IMAP and newsgroup subscriptions with the same tool: the\n"
-"         subscriptions manager.  To start using it, choose\n"
-"         <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Manage\n"
-"         Subscriptions</guimenuitem> </menuchoice>.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1004
-msgid ""
-"      <para>\n"
-"         By default, the message list has columns with the following\n"
-"         headings: an envelope icon indicating whether you have read\n"
-"         or replied to a message (closed for unread, open for read,\n"
-"         and open with an arrow on it to indicate you've sent a\n"
-"         reply), an exclamation point indicating priority, and the\n"
-"         <guilabel>From</guilabel>, <guilabel>Subject</guilabel>, and\n"
-"         <guilabel>Date</guilabel> fields. You can change their order\n"
-"         and remove them by dragging and dropping them.  You can add\n"
-"         new ones with the <guimenuitem>Field Chooser</guimenuitem>\n"
-"         item in the right click menu for the column headings.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1017
-msgid ""
-"      <para>\n"
-"         If you have configured any IMAP (mail) or NNTP (news)\n"
-"         servers, you will see them listed in the left half of the\n"
-"         subscription management window.  Click on a server to select\n"
-"         it, and you will see the folders or newsgroups available to\n"
-"         you.  You can then select individual folders and subscribe to\n"
-"         them, or remove yourself from the subscription list.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1026
-msgid ""
-"      <para>\n"
-"         If you think you'll want to return to a search again, you can\n"
-"         save it as a virtual folder by selecting <guilabel>Store\n"
-"         Search as Virtual Folder</guilabel>.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1032
-msgid ""
-"      <para>\n"
-"         Most of the mail-related actions you'll want to perform are\n"
-"         listed in the <guimenu>Message</guimenu> menu in the menu\n"
-"         bar.  The most frequently used ones, like\n"
-"         <guimenuitem>Reply</guimenuitem> and\n"
-"         <guimenuitem>Forward</guimenuitem>, also appear as buttons in\n"
-"         the toolbar, and almost all of them are duplicated in the\n"
-"         right-click menu and as keyboard shortcuts, which tend to be\n"
-"         faster once you get the hang of them.  You can choose\n"
-"         whichever way you like best; the idea is that the software\n"
-"         should work the way you want, rather than making you work the\n"
-"         way the it does.\n"
-"\t <tip id=\"view-headers\">\n"
-"\t <title>Take a look at the headers</title>\n"
-"\t <para>\n"
-"\t To look at the entire source of your email message, including\n"
-"\t all the header information, select\n"
-"\t <menuchoice><guimenu>View</guimenu><guimenuitem>Source</guimenuitem></"
-"menuchoice>\n"
-"\t </para>\n"
-"\t </tip>\n"
-"       </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1054
-msgid ""
-"      <para>\n"
-"         Right-click on one of the column headers to get a list of\n"
-"         options:\n"
-"             <variablelist>\n"
-"\n"
-"               <varlistentry>\n"
-"                  <term><guimenuitem>Sort Ascending</guimenuitem>,\n"
-"                  <guimenuitem>Sort Descending</guimenuitem>, and\n"
-"                  <guimenuitem>Unsort</guimenuitem></term>\n"
-"                  <listitem><para>Which should be pretty obvious. You\n"
-"                  can also set these sorts by just clicking on the\n"
-"                  column headers.</para></listitem>\n"
-"               </varlistentry>\n"
-"\n"
-"              <varlistentry>\n"
-"                  <term><guimenuitem>Group By this Field</guimenuitem></"
-"term>\n"
-"                  <listitem><para>\n"
-"                     Groups messages instead of sorting them. (FIXME: "
-"Explain further) \n"
-"                  </para></listitem>\n"
-"               </varlistentry>\n"
-"\n"
-"              <varlistentry>\n"
-"                  <term><guimenuitem>Remove this\n"
-"                  Column</guimenuitem></term> <listitem><para> Remove\n"
-"                  this column from the display. You can also remove\n"
-"                  columns by dragging the header off the list and\n"
-"                  letting it drop.  </para></listitem>\n"
-"               </varlistentry>\n"
-"\n"
-"              <varlistentry>\n"
-"                  <term><guimenuitem>Field\n"
-"                  Chooser</guimenuitem></term> <listitem><para> A list\n"
-"                  of column headers; just drag and drop them into\n"
-"                  place between two existing headers. A red arrow will\n"
-"                  appear to show you where you're about to put the\n"
-"                  column.  </para></listitem>\n"
-"               </varlistentry>\n"
-"            </variablelist>\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1094
-msgid ""
-"      <para>\n"
-"         The <interface>filter assistant</interface> also has a set of\n"
-"         buttons:\n"
-"        <itemizedlist>\n"
-"\n"
-"           <listitem><para>\n"
-"            <guibutton>Add</guibutton> &mdash; Create a new filter.\n"
-"           </para></listitem>\n"
-"\n"
-"           <listitem><para>\n"
-"            <guibutton>Edit</guibutton> &mdash; Edit an existing filter.\n"
-"           </para></listitem>\n"
-"\n"
-"           <listitem><para>\n"
-"            <guibutton>Delete</guibutton> &mdash; Delete the selected "
-"filter.\n"
-"           </para></listitem>\n"
-"\n"
-"           <listitem><para> <guibutton>Up</guibutton> &mdash; Move the\n"
-"            selected filter up in the list so it gets applied first.\n"
-"           </para></listitem>\n"
-"\n"
-"           <listitem><para>\n"
-"            <guibutton>Down</guibutton> &mdash;  Move the selected filter "
-"down \n"
-"             in the list, so it comes into play later.\n"
-"           </para></listitem>\n"
-"        </itemizedlist>\n"
-"\n"
-"        If you don't have any filters set up, the only one of those\n"
-"        buttons you can click is <guibutton>Add</guibutton>, which\n"
-"        will open a dialog to let you add a filter rule.  If you do\n"
-"        have filters, you can either add a new filter rule, or select\n"
-"        one from your list and click <guibutton>Edit</guibutton>.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1128
-msgid ""
-"      <para>\n"
-"         When you're done with the search, go back to seeing all your\n"
-"         messages by choosing <guimenuitem>Show All</guimenuitem> from\n"
-"         the <guilabel>Search</guilabel> drop-down box. If you're\n"
-"         sneaky, just enter a blank search: since every message has at\n"
-"         least one space in it, you'll see every message in the\n"
-"         folder.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1137
-msgid ""
-"      <para>\n"
-"        Enter a name for your filter in the <guilabel>Rule\n"
-"        Name</guilabel> field, and then begin choosing the criteria\n"
-"        you'd like to use as you sort your mail.  Choose how many\n"
-"        criteria you'd like by pressing <guibutton>Add\n"
-"        Criterion</guibutton> and <guibutton>Remove\n"
-"        Criterion</guibutton>.  If you have multiple criteria, you\n"
-"        should then decide whether to have the filter do its job only\n"
-"        <guilabel>if all criteria are met</guilabel>, or <guilabel>if\n"
-"        any criteria are met</guilabel>.\n"
-"     </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1149
-msgid ""
-"      <para>\n"
-"        I once worked in the mail room of a large company, where my\n"
-"        job was to bundle, sort, and distribute mail to the various\n"
-"        mail boxes and desks throughout the building.  Filters do that\n"
-"        same job with email, but they lose much less mail than I did.\n"
-"        In addition, you can have multiple filters performing multiple\n"
-"        actions that may effect the same message in several ways.  For\n"
-"        example, your filters could put copies of one message into\n"
-"        multiple folders, or keep a copy and send one to another\n"
-"        person as well, and it can do that in under a second. Which is\n"
-"        to say, it's faster and more flexible than an actual person\n"
-"        with a pile of envelopes.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1163
-msgid ""
-"      <para>\n"
-"        If you'd like to perform a more complex search, open the\n"
-"        advanced search dialog by selecting\n"
-"        <guilabel>Advanced...</guilabel> from the\n"
-"        <guilabel>Search</guilabel> drop-down menu.  Then, create your\n"
-"        search criteria (each with the same options you saw in the\n"
-"        regular search bar), and decide whether you want to find\n"
-"        messages that match all of them, or messages that match even\n"
-"        one. Then, click <guibutton>Search</guibutton> to go and find\n"
-"        those messages.\n"
-"     </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1175
-msgid ""
-"      <para>\n"
-"        Most often, you'll want to have\n"
-"        <application>Evolution</application> put mail into different\n"
-"        folders, but you can have it do almost anything you like.\n"
-"        People who get lots of mail, or who often need to refer to old\n"
-"        messages, find filters especially helpful, but they're good\n"
-"        for anybody who gets more than a few messages a day.  To\n"
-"        create a filter, open the <interface>filter\n"
-"        assistant</interface> by selecting\n"
-"\t<menuchoice>\n"
-"\t  <guimenu>Settings</guimenu> \n"
-"          <guimenuitem>Mail Filters</guimenuitem>\n"
-"        </menuchoice>.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1190
-msgid ""
-"      <para>\n"
-"        Once it's validated the password,\n"
-"\t<application>Evolution</application> will check your mail.\n"
-"\tNew mail will appear in the local <interface>Inbox</interface>\n"
-"\tif you're using a <glossterm>POP</glossterm> account, and in\n"
-"\tyour <glossterm>IMAP</glossterm> folders if you use IMAP.  If\n"
-"\tyou have chosen to use IMAP, and you have multiple folders on\n"
-"\tyour IMAP server, you may need to subscribe to them.  To learn\n"
-"\thow to use the subscription manager, read <xref\n"
-"\tlinkend=\"usage-mail-subscriptions\">.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1202
-msgid ""
-"      <para>\n"
-"        Once you have subscribed to a folder or newsgroup, your system\n"
-"        will check for new messages whenever you press the\n"
-"        <guibutton>Get Mail</guibutton> button.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1208
-msgid ""
-"      <para>\n"
-"        The <interface>filter assistant</interface> window contains a\n"
-"        list of your current filters, sorted by the order in which\n"
-"        they are used.  From the drop-down box at the top of the\n"
-"        window, choose <guilabel>Incoming</guilabel> to display\n"
-"        filters for incoming mail, and <guilabel>Outgoing</guilabel>\n"
-"        for those which sort only outgoing mail.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1217
-msgid ""
-"      <para>\n"
-"        The filter rule editor, shown in <xref\n"
-"        linkend=\"usage-mail-filters-fig-new\">, is where you'll\n"
-"        actually create your filtering rule.\n"
-"\n"
-"       <figure id=\"usage-mail-filters-fig-new\">\n"
-"\t <title>Creating a new Filter</title>\n"
-"\t <screenshot>\n"
-"\t  <screeninfo>Creating a new Filter</screeninfo>\n"
-"\t  <graphic fileref=\"fig/filter-new-fig\" format=\"png\" srccredit=\"Aaron "
-"Weber\">\n"
-"\t</graphic>\n"
-"\t</screenshot>\n"
-"      </figure>\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1232
-msgid ""
-"      <para>\n"
-"        When you click <guibutton>OK</guibutton>, your new folder will\n"
-"\tappear in the <interface>folder view</interface>.  You can\n"
-"\tthen put messages in it by dragging and dropping them, or by\n"
-"\tusing the <guibutton>Move</guibutton> button in the\n"
-"\ttoolbar. If you want to move several messages at once, click\n"
-"\ton the ones you want to move while holding down the\n"
-"\t<keycap>CTRL</keycap> key, or use <keycap>Shift</keycap> to\n"
-"\tselect a range of messages.  If you create a filter with the\n"
-"\t<interface>filter assistant</interface>, you can have mail\n"
-"\tmoved to your folder automatically.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1245
-msgid ""
-"      <para>\n"
-"        You're done.  Click <guibutton>OK</guibutton> to use this\n"
-"        filter, or <guibutton>Cancel</guibutton> to close the window\n"
-"        without saving any changes.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1251
-msgid ""
-"      <para>\n"
-"       You can start reading email by clicking\n"
-"       <guibutton>Inbox</guibutton> in the shortcut bar. The first\n"
-"       time you use <application>Evolution</application>, it will\n"
-"       start with the <interface>Inbox</interface> open and show you a\n"
-"       message from Ximian welcoming you to the application.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1259
-msgid "      <title>Checking Mail</title>\n"
-msgstr "      <title>Comprobando el Correo</title>\n"
-
-#: tmp/usage-mail.sgml.h:1261
-msgid "      <title>Getting Organized with Folders</title>\n"
-msgstr "      <title>Estar Organizando con Carpetas</title>\n"
-
-#: tmp/usage-mail.sgml.h:1263
-msgid "      <title>Getting Really Organized with Virtual Folders</title>\n"
-msgstr ""
-"      <title>Estar Realmente Organizado con Carpetas Virtuales</title>\n"
-
-#: tmp/usage-mail.sgml.h:1265
-msgid "      <title>Reading Mail</title>\n"
-msgstr "      <title>Leyendo el Correo</title>\n"
-
-#: tmp/usage-mail.sgml.h:1267
-msgid "      <title>Searching for Messages</title>\n"
-msgstr "      <title>Buscando Mensajes</title>\n"
-
-#: tmp/usage-mail.sgml.h:1269
-msgid "      <title>Sorting Mail with Column Headers</title>\n"
-msgstr "      <title>Ordenando el Correo según las Columnas</title>\n"
-
-#: tmp/usage-mail.sgml.h:1271
-msgid "      <title>Staying organized: Mail Filters in Evolution</title>\n"
-msgstr ""
-"      <title>Estar organizado: Filtros de correo en Evolution</title>\n"
-
-#: tmp/usage-mail.sgml.h:1273
-msgid "      <title>Subscription Management</title>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1275
-msgid "      <title>Writing and Sending Mail</title>\n"
-msgstr "      <title>Escribiendo y Enviando Correo</title>\n"
-
-#: tmp/usage-mail.sgml.h:1277
-msgid ""
-"     <para>\n"
-"\tIf you get an error message instead of mail, you probably need\n"
-"\tto change your network settings.  To learn how to do that,\n"
-"\thave a look at <xref linkend=\"config-prefs-mail-network\">, or\n"
-"\task your system administrator.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1284
-msgid ""
-"     <para>\n"
-"        For each filter criterion, you must first select what\n"
-"        part of the message you want the filter to examine:\n"
-"        <variablelist>\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Sender</guilabel></term>\n"
-"\t    <listitem><para>\n"
-"                The sender's address.\n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Recipients</guilabel></term>\n"
-"\t    <listitem><para>\n"
-"               The recipients of the message.\n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Subject</guilabel></term>\n"
-"\t    <listitem><para>\n"
-"                The subject line of the message.\n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Specific Header</guilabel></term>\n"
-"\t    <listitem><para>\n"
-"              The filter can look at any header you\n"
-"\t      want, even obscure or custom ones. Enter the header name\n"
-"\t      in the first text box, and put your search text in the\n"
-"\t      second one.\n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Message Body</guilabel></term>\n"
-"\t    <listitem><para>\n"
-"                Search in the actual text of the message.\n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Expression</guilabel></term>\n"
-"\t    <listitem>\n"
-"             <para>\n"
-"               Enter a <glossterm linkend=\"regular-expression\">regular\n"
-"\t       expression</glossterm>, and\n"
-"\t       <application>Evolution</application> will search the\n"
-"\t       entire message, including headers, to match it for you.\n"
-"\t     </para>\n"
-"           </listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Date Sent</guilabel></term>\n"
-"\t    <listitem><para> Filter messages by when they were sent:\n"
-"\t    First, choose the conditions you want a message to\n"
-"\t    meet&mdash; <guilabel>before</guilabel> a given time,\n"
-"\t    <guilabel>after</guilabel> it, and so forth.  Then, choose\n"
-"\t    the time. The filter will compare the message's time-stamp\n"
-"\t    to the system clock when the filter is run, or to a\n"
-"\t    specific time and date you choose from a calendar.  You\n"
-"\t    can even have it look for messages within a range of time\n"
-"\t    relative to the filter&mdash perhaps you're looking for\n"
-"\t    messages less than two days old.  </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Date Recieved</guilabel></term>\n"
-"\t    <listitem><para>\n"
-"                This works the same way as the <guilabel>Date Sent</"
-"guilabel> \n"
-"                option, except that it compares the time you got the "
-"message \n"
-"                with the dates you specify.\n"
-"            </para></listitem>\n"
-"\t  </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Priority</guilabel></term>\n"
-"\t    <listitem><para>\n"
-"               Emails have a standard priority range from -3 (least\n"
-"               important) to 3 (most important). You can have filters set "
-"the\n"
-"               priority of messages you recieve, and then have other "
-"filters \n"
-"               applied only to those messages which have a certain "
-"priority.\n"
-"            </para></listitem>\n"
-"           </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Regex Match</guilabel></term>\n"
-"\t    <listitem>\n"
-"              <para>\n"
-"                If you know your way around a <glossterm\n"
-"  \t        linkend=\"regular-expression\">regex</glossterm>, or\n"
-"  \t        regular expression, put your knowledge to use here.\n"
-"  \t       </para>\n"
-"            </listitem>\n"
-"          </varlistentry>\n"
-"\n"
-"\t  <varlistentry>\n"
-"\t    <term><guilabel>Source</guilabel></term>\n"
-"\t    <listitem>\n"
-"               <para>\n"
-"               Filter messages according the server you got them from.\n"
-"               You can enter a URL or choose one from the drop-down\n"
-"               list.  This ability is only relevant if you use more\n"
-"               than one mail source.\n"
-"             </para>\n"
-"            </listitem>\n"
-"\t  </varlistentry>\n"
-"\t</variablelist>\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1398
-msgid ""
-"     <para>\n"
-"        Then, you need to enter your email\n"
-"        password. <application>Evolution</application> will remember\n"
-"        your password until until you select <menuchoice>\n"
-"        <guimenu>Settings</guimenu> <guimenuitem>Forget\n"
-"        Passwords</guimenuitem> </menuchoice>.\n"
-"      </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1406
-msgid ""
-"     <para>\n"
-"        You'll see a similar approach to sorting messages when you\n"
-"        create filters and virtual folders in the next few sections.\n"
-"     </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1411
-msgid "     <title>Can't Check Mail?</title> \n"
-msgstr "     <title>¿No Puede Leer su Correo?</title> \n"
-
-#: tmp/usage-mail.sgml.h:1413
-msgid ""
-"    <para>\n"
-"       <application>Evolution</application> email is like other email\n"
-"       programs in all the ways you would hope:\n"
-"     <itemizedlist>\n"
-"       <listitem>\n"
-"\t <para>\n"
-"\t   It can sort and organize your mail in a wide variety of ways with\n"
-"\t   folders, searches, and filters.\n"
-"\t </para>\n"
-"       </listitem>\n"
-"       <listitem>\n"
-"\t <para>\n"
-"\t  It can send and receive mail in HTML or as plain text, and\n"
-"\t  permits multiple file attachments.\n"
-"\t </para>\n"
-"       </listitem>\n"
-"       <listitem>\n"
-"\t <para>\n"
-"\t   It supports multiple mail sources, including <glossterm\n"
-"\t   linkend=\"imap\">IMAP</glossterm>, <glossterm\n"
-"\t   linkend=\"pop\">POP3</glossterm>, local\n"
-"\t   <systemitem><filename>mbox</filename></systemitem> and\n"
-"\t   <systemitem><filename>mh</filename></systemitem> files, and\n"
-"\t   even NNTP messages (newsgroups), which aren't technically\n"
-"\t   email.\n"
-"\t </para>\n"
-"       </listitem>\n"
-"     </itemizedlist>\n"
-"    </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1443
-msgid ""
-"    <para>\n"
-"      Even if you only get a few email messages a day, you probably\n"
-"      want to sort and organize them.  When you get a hundred a day\n"
-"      and you want to refer to a message you received six weeks ago,\n"
-"      you <emphasis>need</emphasis> to sort and organize them.\n"
-"      Fortunately, <application>Evolution</application> has the tools\n"
-"      to help you do it.\n"
-"    </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1452
-msgid ""
-"    <para>\n"
-"      However, <application>Evolution</application> has some important\n"
-"      differences.  First, it's built to handle very large amounts of\n"
-"      mail without slowing down or crashing.  Both the <link\n"
-"      linkend=\"usage-mail-organize-filters\">filtering</link> and <link\n"
-"      linkend=\"usage-mail-organize-search\">searching</link> functions\n"
-"      were built for speed and efficiency on gargantuan volumes of\n"
-"      mail. There's also the <application>Evolution</application>\n"
-"      <link linkend=\"usage-mail-organize-vFolders\">Virtual\n"
-"      Folder</link>, an advanced organizational feature not found in\n"
-"      other mail clients.  If you get a lot of mail, or if you keep\n"
-"      every message you get in case you need to refer to it later,\n"
-"      you'll find this feature especially useful.\n"
-"    </para>\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1467
-msgid "    <title> An Overview of the Evolution Mailer</title>\n"
-msgstr "    <title> Una Vista General del Correo en Evolution</title>\n"
-
-#: tmp/usage-mail.sgml.h:1469
-msgid "    <title>Organizing Your Mail</title>\n"
-msgstr "    <title>Organizando Su Correo</title>\n"
-
-#: tmp/usage-mail.sgml.h:1471
-msgid "    <title>Reading, Getting and Sending Mail</title>\n"
-msgstr "    <title>Leyendo, Obteniendo y Enviando Correo</title>\n"
-
-#: tmp/usage-mail.sgml.h:1473
-msgid ""
-"   <!-- FIXME: This needs to be in there.  But the feature is temporarily\n"
-"         disabled and I don't know how it will be reimplemented.\n"
-"\n"
-"\t  <itemizedlist>\n"
-"\t    <listitem>\n"
-"\t       <para>\n"
-"\t\t <guilabel>When mail arrives:</guilabel> Select\n"
-"\t\t this option to have messages filtered as they\n"
-"\t\t arrive.\n"
-"\t       </para>\n"
-"\t     </listitem>\n"
-"\t     <listitem>\n"
-"\t       <para>\n"
-"\t\t <guilabel>When mail is sent:</guilabel> Select\n"
-"\t\t this option to filter your outgoing mail.  You\n"
-"\t\t can use this feature to keep your\n"
-"\t\t <interface>Outbox</interface> as organized as\n"
-"\t\t your <interface>Inbox</interface>.\n"
-"\t     </para>\n"
-"\t  </listitem>\n"
-"\t</itemizedlist>\n"
-"      </para>\n"
-"\n"
-"    -->\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1498
-msgid "  <title>Evolution Mail</title>\n"
-msgstr "  <title>Correo en Evolution</title>\n"
-
-#: tmp/usage-mail.sgml.h:1500
-msgid " <!-- ==============Figure=================================== -->\n"
-msgstr " <!-- ==============Figure=================================== -->\n"
-
-#: tmp/usage-mail.sgml.h:1502
-msgid ""
-" <!-- Check the alignment of the following paragraph in the PS and\n"
-" HTML output: it's indented for no good reason -->\n"
-msgstr ""
-" <!-- Check the alignment of the following paragraph in the PS and\n"
-" HTML output: it's indented for no good reason -->\n"
-
-#: tmp/usage-mail.sgml.h:1505
-msgid ""
-"<!--\n"
-"\t<sect3 id=\"usage-mail-getnsend-send-live\">\n"
-"\t  <title>Live Documents</title>\n"
-"\t  <para>\n"
-"\t    Later versions of <application>Evolution</application>\n"
-"\t    will allow you to enliven your email with almost any\n"
-"\t    sort of document, and even with entire\n"
-"\t    applications. At this point, however, this feature has not \n"
-"\t    yet been implemented.\n"
-"\t  </para>\n"
-"\t</sect3>\n"
-"-->\n"
-msgstr ""
-
-#: tmp/usage-mail.sgml.h:1518
-msgid ""
-"<!--\n"
-"<!DOCTYPE Chapter PUBLIC \"-//GNOME//DTD DocBook PNG Variant V1.1//EN\">\n"
-"-->\n"
-msgstr ""
-"<!--\n"
-"<!DOCTYPE Chapter PUBLIC \"-//GNOME//DTD DocBook PNG Variant V1.1//EN\">\n"
-"-->\n"
-
-#: tmp/usage-mail.sgml.h:1522
-msgid "<!--   ==============Figure=================================== -->\n"
-msgstr "<!--   ==============Figure=================================== -->\n"
-
-#: tmp/usage-mail.sgml.h:1524
-msgid "<!-- ==============End of Figure============================== -->\n"
-msgstr "<!-- ==============End of Figure============================== -->\n"
-
-#: tmp/usage-mail.sgml.h:1526
-msgid ""
-"<!-- ==============End of Figure=================================== -->\n"
-msgstr ""
-"<!-- ==============End of Figure=================================== -->\n"
-
-#: tmp/usage-mail.sgml.h:1528
-msgid ""
-"<!-- Function not implemented, \n"
-"possibly never will be due to security evil. -->\n"
-msgstr ""
-"<!-- Function not implemented, \n"
-"possibly never will be due to security evil. -->\n"
diff --git a/help/es.po/usage-mainwindow.sgml.po b/help/es.po/usage-mainwindow.sgml.po
deleted file mode 100644
index 9df4079faa..0000000000
--- a/help/es.po/usage-mainwindow.sgml.po
+++ /dev/null
@@ -1,788 +0,0 @@
-# Translation into Spanish of Evolution docs.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Héctor García Álvarez <hector@scouts-es.org>, 2000.
-# Héctor García Álvarez <hector@scouts-es.org>, 2001.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution-docs\n"
-"POT-Creation-Date: 2001-04-20 13:43+0200\n"
-"PO-Revision-Date: 2000-12-28 15:38+0100\n"
-"Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: tmp/usage-mainwindow.sgml.h:1
-msgid ""
-"\t  <para>\n"
-"              Calendars must go in calendar folders, mail in mail\n"
-"\t      folders, and contacts in contact folders.\n"
-"           </para>\n"
-msgstr ""
-"\t  <para>\n"
-"              Los calendarios deben ir en carpetas de calendarios, el "
-"correo\n"
-"\t      en carpetas de correo, y los contactos en carpetas de contactos.\n"
-"           </para>\n"
-
-#: tmp/usage-mainwindow.sgml.h:6
-msgid "\t  <title>Folders Have Limits</title>\n"
-msgstr "\t  <title>Las Carpetas Tienen Limitaciones</title>\n"
-
-#: tmp/usage-mainwindow.sgml.h:8
-msgid ""
-"       <para>\n"
-"         To change the way the shortcut bar looks, right-click in an\n"
-"         empty space on the shortcut bar.  From the menu that appears,\n"
-"         you can select icon sizes.\n"
-"       </para>\n"
-msgstr ""
-"       <para>\n"
-"         Para cambiar el aspecto de la barra de atajos, pulse con el botón\n"
-"         derecho en cualquier espacio vacío de la barra de atajos.  Del "
-"menú\n"
-"         que aparece, puede elegir el tamaño de los iconos.\n"
-"       </para>\n"
-
-#: tmp/usage-mainwindow.sgml.h:14
-msgid ""
-"       <para>\n"
-"         To remove a shortcut from the shortcut bar, right-click on it\n"
-"         and select <guimenuitem>Remove</guimenuitem>.  To add one,\n"
-"         select <menuchoice> <guimenu>File</guimenu>\n"
-"         <guisubmenu>New</guisubmenu> <guimenuitem>Evolution Bar\n"
-"         Shortcut</guimenuitem> </menuchoice>.\n"
-"      </para>\n"
-msgstr ""
-"       <para>\n"
-"         Para quitar un atajo de la barra de atajos, pulse con el botón\n"
-"         derecho sobre el y seleccione <guimenuitem>Quitar</guimenuitem>.\n"
-"         Para añadir uno, seleccione <menuchoice> <guimenu>Archivo</"
-"guimenu>\n"
-"         <guisubmenu>Nuevo</guisubmenu> <guimenuitem>atajo de la barra de\n"
-"         atajos de Evolution</guimenuitem> </menuchoice>.\n"
-"      </para>\n"
-
-#: tmp/usage-mainwindow.sgml.h:22
-msgid ""
-"       <para>\n"
-"         You don't need the folder bar or the shortcut bar to move\n"
-"         around the main window. You can use <keycap>Tab</keycap> to\n"
-"         switch from one part of the window to another, and the folder\n"
-"         menu on the right side of the window just below the toolbar\n"
-"         to move about the folder tree.\n"
-"       </para>\n"
-msgstr ""
-"       <para>\n"
-"         No necesita la barra de carpetas o la barra de atajos para moverse\n"
-"         por la ventana principal. Puede usar el <keycap>Tabulador</keycap>\n"
-"         para cambiar de una parte de la ventana a otra, y al menú de\n"
-"         carpetas en la parte derecha de la ventana debajo de la barra de\n"
-"         herramientas para moverse por el arbol de carpetas.\n"
-"       </para>\n"
-
-#: tmp/usage-mainwindow.sgml.h:30
-msgid "       <title>Shortcut Bar Tricks</title>\n"
-msgstr "       <title>Trucos de la Barra de Atajos</title>\n"
-
-#: tmp/usage-mainwindow.sgml.h:32
-msgid ""
-"      <para>\n"
-"\tGNOME 2.0 will support context-sensitive help, which means you\n"
-"\tcan almost always get help on an item by right-clicking it.\n"
-"\tIf you're not sure what something is, or don't know what you\n"
-"\tcan do with it, choosing <guimenuitem>Help</guimenuitem> from\n"
-"\tthe right-click menu is a good way to find out.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"\tGNOME 2.0 soportará ayuda contextual, lo que significa que casi\n"
-"\tsiempre puede obtener ayuda acerca de un elemento pulsando sobre él\n"
-"\tcon el botón derecho.  Si no está seguro acerca de algo, o no sabe lo\n"
-"\tlo que puede hacer con ello, eligir <guimenuitem>Ayuda</guimenuitem>\n"
-"\tdel menú del botón derecho es una buena manera de averiguarlo.\n"
-"      </para>\n"
-
-#: tmp/usage-mainwindow.sgml.h:40
-msgid "     <title>Context-Sensitive Help</title>\n"
-msgstr "     <title>Ayuda Sensible al Contexto</title>\n"
-
-#: tmp/usage-mainwindow.sgml.h:42
-msgid ""
-"    <para>\n"
-"       \n"
-"      A typical <guilabel>Local</guilabel> folder contains the following "
-"folders:\n"
-"      <itemizedlist>\n"
-"\t <listitem>\n"
-"\t    <para>\n"
-"\t     <guilabel>Calendar</guilabel>, for appointments and\n"
-"\t     event listings.\n"
-"\t   </para>\n"
-"\t </listitem> \n"
-"\t <listitem>\n"
-"\t    <para>\n"
-"\t    <guilabel>Contacts</guilabel>, for address cards.\n"
-"\t   </para>\n"
-"\t </listitem>\n"
-"\t <listitem>\n"
-"\t    <para>\n"
-"\t     <guilabel>Inbox</guilabel>, for incoming mail. \n"
-"\t   </para>\n"
-"\t </listitem>\n"
-"         <listitem>\n"
-"\t    <para>\n"
-"\t    <guilabel>Drafts</guilabel>, for messages you started and didn't "
-"finish.\n"
-"\t   </para>\n"
-"\t </listitem>\n"
-"\t<listitem>\n"
-"\t    <para>\n"
-"\t    <guilabel>Sent</guilabel>, for sent mail.\n"
-"\t   </para>\n"
-"\t </listitem>\n"
-"\t<listitem>\n"
-"\t    <para>\n"
-"\t    <guilabel>Trash</guilabel>, which is used to store\n"
-"\t    messages you don't want, but keep around just in case you\n"
-"\t    change your mind.\n"
-"\t   </para>\n"
-"\t </listitem>\n"
-"\t<listitem>\n"
-"\t    <para>\n"
-"\t    <guilabel>Outbox</guilabel>, for messages you have written\n"
-"\t    but not yet sent.  This will be empty unless you use\n"
-"\t    <application>Evolution</application> while offline.\n"
-"\t   </para>\n"
-"\t </listitem>\n"
-"\n"
-"      </itemizedlist>\n"
-"\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"       \n"
-"      Una carpeta <guilabel>Local</guilabel> típica contiene las siguientes "
-"carpetas:\n"
-"      <itemizedlist>\n"
-"\t <listitem>\n"
-"\t    <para>\n"
-"\t     <guilabel>Calendario</guilabel>, para citas y\n"
-"\t     listas de eventos.\n"
-"\t   </para>\n"
-"\t </listitem> \n"
-"\t <listitem>\n"
-"\t    <para>\n"
-"\t    <guilabel>Contactos</guilabel>, para tarjetas de direcciones.\n"
-"\t   </para>\n"
-"\t </listitem>\n"
-"\t <listitem>\n"
-"\t    <para>\n"
-"\t     <guilabel>Inbox</guilabel>, para el correo de entrada. \n"
-"\t   </para>\n"
-"\t </listitem>\n"
-"         <listitem>\n"
-"\t    <para>\n"
-"\t    <guilabel>Drafts</guilabel>, para mensajes que comenzó y no terminó.\n"
-"\t   </para>\n"
-"\t </listitem>\n"
-"\t<listitem>\n"
-"\t    <para>\n"
-"\t    <guilabel>Sent</guilabel>, para los mensajes enviados.\n"
-"\t   </para>\n"
-"\t </listitem>\n"
-"\t<listitem>\n"
-"\t    <para>\n"
-"\t    <guilabel>Trash</guilabel>, se usa para guardar mensajes que no\n"
-"\t    quiere, pero que se deján aquí por si cambia de idea.\n"
-"\t   </para>\n"
-"\t </listitem>\n"
-"\t<listitem>\n"
-"\t    <para>\n"
-"\t    <guilabel>Outbox</guilabel>, para mensajes que ha escrito pero no\n"
-"\t    han sido enviados todavía.  Estará vacía a menos que use\n"
-"\t    <application>Evolution</application> mientras está desconectado.\n"
-"\t   </para>\n"
-"\t </listitem>\n"
-"\n"
-"      </itemizedlist>\n"
-"\n"
-"    </para>\n"
-
-#: tmp/usage-mainwindow.sgml.h:91
-msgid ""
-"    <para>\n"
-"        <application>Evolution</application>'s most important job is\n"
-"        to give you access to your information and help you use it\n"
-"        quickly.  One way it does that is through the\n"
-"        <interface>shortcut bar</interface>, the column on the left\n"
-"        hand side of the main window.  The large buttons with names\n"
-"        like <guilabel>Inbox</guilabel> and\n"
-"        <guilabel>Contacts</guilabel> are the shortcuts, and you can\n"
-"        select different groups of shortcuts by clicking the\n"
-"        rectangular group buttons.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"        El trabajo más importante de <application>Evolution</application> "
-"es\n"
-"        darle acceso a su información y ayudarle a usarla rapidamente.  Una\n"
-"        de las maneras en las que hace esto es atraves de la\n"
-"        <interface>barra de atajos</interface>, la columna a la izquierda "
-"de\n"
-"        la ventana principal.  Los botones grandes con nombres como\n"
-"        <guilabel>Inbox</guilabel> y <guilabel>Contactos</guilabel> son\n"
-"        los atajos, y puede seleccionar distintos grupos de atajos\n"
-"        pulsando los grupos de botones rectangulares.\n"
-"    </para>\n"
-
-#: tmp/usage-mainwindow.sgml.h:103
-msgid ""
-"    <para>\n"
-"       Take a look at the <guilabel>Evolution Shortcuts</guilabel>\n"
-"       again.  The shortcut buttons in that category are:\n"
-"\n"
-"      <variablelist>\n"
-"\n"
-"<!--  NOT IMPLEMENTED! \n"
-"\t<varlistentry>\n"
-"\t<term> <guibutton>Today:</guibutton></term>\n"
-"\t<listitem>\n"
-"\t  <para>\n"
-"\tThis will bring up a summary of any new messages you've\n"
-"\treceived, along with the tasks and appointments you have\n"
-"\tlined up for today.\n"
-"      </para>\n"
-"      </listitem>\n"
-"      </varlistentry>\n"
-"-->\n"
-"\n"
-"\n"
-"\t<varlistentry>\n"
-"\t  <term> <guibutton>Executive Summary:</guibutton></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"\t      Start your day here.  The Executive summary gives you\n"
-"              lists of new or important messages, daily appointments\n"
-"              and urgent tasks.  You can customize its appearance and\n"
-"              content, and use it to access Evolution services.\n"
-"\t    </para>\n"
-"\t  </listitem>\n"
-"\t</varlistentry>\n"
-"\n"
-"\n"
-"\t<varlistentry>\n"
-"\t  <term> <guibutton>Inbox:</guibutton></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"\t      Click the <guibutton>Inbox</guibutton> button to start\n"
-"\t      reading your mail.  Your Inbox is also where you can\n"
-"\t      access Evolution's tools to filter, sort, organize, and\n"
-"\t      search your mail.\n"
-"\t    </para>\n"
-"\t  </listitem>\n"
-"\t</varlistentry>\n"
-"\n"
-"\t<varlistentry>\n"
-"\t  <term><guibutton>Calendar:</guibutton></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"\t      The Calendar can store your appointments and To do lists\n"
-"\t      for you.  Connected to a network, you can use it to keep\n"
-"\t      a group of people on schedule and up to date.\n"
-"\t    </para>\n"
-"\t  </listitem>\n"
-"\t</varlistentry>\n"
-"\n"
-"       <varlistentry>\n"
-"         <term><guibutton>Tasks:</guibutton></term>\n"
-"\t<listitem>\n"
-"\t  <para>\n"
-"\t     A full-size view of your calendar's task pad.\n"
-"\t  </para>\n"
-"\t</listitem>\n"
-"      </varlistentry>\n"
-"\n"
-"\t<varlistentry>\n"
-"\t  <term><guibutton>Contacts:</guibutton></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"\t      The Contact Manager holds your addresses, phone numbers,\n"
-"\t      and contact information.  Like calendar information,\n"
-"\t      contact data can be synchronized with hand-held devices\n"
-"\t      and shared over a network.\n"
-"\t   </para>\n"
-"\t  </listitem>\n"
-"\t</varlistentry>\n"
-"\n"
-"<!-- NOT IMPLEMENTED YET\n"
-"\n"
-"\n"
-"\t<varlistentry>\n"
-"\t  <term> <guibutton>Notes:</guibutton></term>\n"
-"\t<listitem>\n"
-"\t  <para> The note pad is your catch-all tool: use it to take\n"
-"\t    messages from phone conversations, keep small things\n"
-"\t    organized, write <glossterm linkend=\"haiku\">haiku</glossterm>, or "
-"whatever\n"
-"\t    you like. This feature is not yet implemented, but will be\n"
-"\t    soon. See <xref linkend=\"usage-notes\"> for more\n"
-"\t    information.\n"
-"\t  </para>\n"
-"\t</listitem>\n"
-"\t</varlistentry>\n"
-"-->\n"
-"\n"
-"      </variablelist>\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"       Vuelva a echar un vistazo a los <guilabel>Atajos de\n"
-"       Evolution</guilabel>.  Los atajos en esa categoría son:\n"
-"\n"
-"      <variablelist>\n"
-"\n"
-"<!--  ¡SIN IMPLEMENTAR! \n"
-"\t<varlistentry>\n"
-"\t<term> <guibutton>Today:</guibutton></term>\n"
-"\t<listitem>\n"
-"\t  <para>\n"
-"\tThis will bring up a summary of any new messages you've\n"
-"\treceived, along with the tasks and appointments you have\n"
-"\tlined up for today.\n"
-"      </para>\n"
-"      </listitem>\n"
-"      </varlistentry>\n"
-"-->\n"
-"\n"
-"\n"
-"\t<varlistentry>\n"
-"\t  <term> <guibutton>Resumen de Trabajo:</guibutton></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"\t      Comienze aquí su día.  El resumen de trabajo le muestra la lista\n"
-"              de mensajes nuevos o importantes, las citas diarias y las\n"
-"              tareas urgentes.  Puede personalizar su apariencia y\n"
-"              contenido, y usarlo para acceder a los servicios de "
-"Evolution.\n"
-"\t    </para>\n"
-"\t  </listitem>\n"
-"\t</varlistentry>\n"
-"\n"
-"\n"
-"\t<varlistentry>\n"
-"\t  <term> <guibutton>Inbox:</guibutton></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"\t      Pulse el botón <guibutton>Inbox</guibutton> para comenzar a leer\n"
-"\t      su correo.  Su Inbox es tambien donde puede acceder a las\n"
-"\t      herramientas de Evolution para filtrar, ordenar, organizar, y\n"
-"\t      buscar su correo.\n"
-"\t    </para>\n"
-"\t  </listitem>\n"
-"\t</varlistentry>\n"
-"\n"
-"\t<varlistentry>\n"
-"\t  <term><guibutton>Calendario:</guibutton></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"\t      El calendario puede guardar sus citas y su lista de tareas por\n"
-"\t      hacer.  Conectado a una red, puede usarlo para mantener el horario\n"
-"\t      de un grupo de personas y tenerlo al día.\n"
-"\t    </para>\n"
-"\t  </listitem>\n"
-"\t</varlistentry>\n"
-"\n"
-"       <varlistentry>\n"
-"         <term><guibutton>Tareas:</guibutton></term>\n"
-"\t<listitem>\n"
-"\t  <para>\n"
-"\t     Una vista a pantalla completa de la parte de tareas de su calendario\n"
-"\t  </para>\n"
-"\t</listitem>\n"
-"      </varlistentry>\n"
-"\n"
-"\t<varlistentry>\n"
-"\t  <term><guibutton>Contactos:</guibutton></term>\n"
-"\t  <listitem>\n"
-"\t    <para>\n"
-"\t      El Administrador de Contactos guarda su información de direcciones,\n"
-"\t      números de teléfono, e información de contacto.  Al igual que la\n"
-"\t      información del calendario, los datos de contactos pueden\n"
-"\t      sicronizarse con dispositivos de mano y ser compartidos a traves de\n"
-"\t      una red.\n"
-"\t   </para>\n"
-"\t  </listitem>\n"
-"\t</varlistentry>\n"
-"\n"
-"<!-- NOT IMPLEMENTED YET\n"
-"\n"
-"\n"
-"\t<varlistentry>\n"
-"\t  <term> <guibutton>Notes:</guibutton></term>\n"
-"\t<listitem>\n"
-"\t  <para> The note pad is your catch-all tool: use it to take\n"
-"\t    messages from phone conversations, keep small things\n"
-"\t    organized, write <glossterm linkend=\"haiku\">haiku</glossterm>, or "
-"whatever\n"
-"\t    you like. This feature is not yet implemented, but will be\n"
-"\t    soon. See <xref linkend=\"usage-notes\"> for more\n"
-"\t    information.\n"
-"\t  </para>\n"
-"\t</listitem>\n"
-"\t</varlistentry>\n"
-"-->\n"
-"\n"
-"      </variablelist>\n"
-"    </para>\n"
-
-#: tmp/usage-mainwindow.sgml.h:200
-msgid ""
-"    <para>\n"
-"       The shortcut group buttons are <guibutton>Evolution\n"
-"       Shortcuts</guibutton> and <guibutton>Internet\n"
-"       Directories</guibutton>.  When you click on them, they'll slide\n"
-"       up and down to give you access to different sorts of shortcuts.\n"
-"       When you first start <application>Evolution</application>, you\n"
-"       are looking at the <guilabel>Evolution Shortcuts</guilabel>\n"
-"       category.  If you click <guilabel>Internet\n"
-"       Directories</guilabel>, it will slide up and you'll see buttons\n"
-"       for the <guilabel>Bigfoot</guilabel> and\n"
-"       <guilabel>Netcenter</guilabel> directories, as well as any\n"
-"       others you or your system administrator may have added. You can\n"
-"       add more groups by right-clicking on the background of the\n"
-"       shortcut bar and selecting <guimenuitem>Menu\n"
-"       Group</guimenuitem>.  Internet directories behave a lot like\n"
-"       the local contact manager, which is covered in <xref\n"
-"       linkend=\"usage-contact\">.\n"
-"       </para>\n"
-msgstr ""
-"    <para>\n"
-"       Los botones de los grupos de atajos son <guibutton>Atajos de\n"
-"       Evolution</guibutton> y <guibutton>Directorios de\n"
-"       Internet</guibutton>.  Cuando pulsas sobre ellos, se deslizan\n"
-"       arriba y abajo para dejarle acceder a los diferentes tipos de\n"
-"       atajos. La primera vez qe inicia\n"
-"       <application>Evolution</application>, verá la categoría\n"
-"       <guilabel>Atajos de Evolution</guilabel>.  Si pulsa sobre\n"
-"       <guilabel>Directorios de Internet</guilabel>, se deslizará hacia\n"
-"       arriba y verá botones para los directorios\n"
-"       <guilabel>Bigfoot</guilabel> y <guilabel>Netcenter</guilabel>,\n"
-"       así como cualquier otro que usted o su administrador hayan\n"
-"       añadido. Puede añadir más grupos pulsando con el botón derecho\n"
-"       sobre el fondo de la barra de atajos y seleccionando\n"
-"       <guimenuitem>Menú de Grupos</guimenuitem>.  Los directorios de\n"
-"       Internet se comportan muy similarmente al administrador de\n"
-"       contactos local, el cual se cubre en <xref\n"
-"       linkend=\"usage-contact\">.\n"
-"       </para>\n"
-
-#: tmp/usage-mainwindow.sgml.h:219
-msgid ""
-"    <para>\n"
-"       To create a new folder, select <menuchoice>\n"
-"       <guimenu>File</guimenu> <guisubmenu>New</guisubmenu>\n"
-"       <guimenuitem>Folder</guimenuitem></menuchoice>.  You'll be asked "
-"where you want to\n"
-"       put it, and what kind of folder it should be.  You can choose\n"
-"       from three types: <guilabel>Mail</guilabel>, for storing mail,\n"
-"       <guilabel>Calendar</guilabel> for storing calendars, and\n"
-"       <guilabel>Contacts</guilabel> for storing contacts.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"       Para crear una nueva carpeta, seleccione <menuchoice>\n"
-"       <guimenu>Archivo</guimenu> <guisubmenu>Nuevo</guisubmenu>\n"
-"       <guimenuitem>Carpeta</guimenuitem></menuchoice>.  Será preguntado "
-"acerca de donde\n"
-"       quiere ponerla, y que clase de carpeta debería ser.  Puede elegir\n"
-"       entre tres tipos: <guilabel>Correo</guilabel>, para guardar\n"
-"       correo, <guilabel>Calendario</guilabel> para guardar calendarios,\n"
-"       y <guilabel>Contactos</guilabel> para guardar contactos.\n"
-"    </para>\n"
-
-#: tmp/usage-mainwindow.sgml.h:229
-msgid ""
-"    <para>\n"
-"      Any time new information arrives in a folder, that folder label\n"
-"      is displayed in bold text.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"      Cuando llega información nueva a una carpeta, el nombre de esa\n"
-"      carpeta se escribe en negrita.\n"
-"    </para>\n"
-
-#: tmp/usage-mainwindow.sgml.h:234
-msgid ""
-"    <para>\n"
-"      If you don't like the shortcut bar, you can use the folder bar\n"
-"      or the menu bar to navigate the main window. Press \n"
-"            <keycombo action=\"simul\">\n"
-"                 <keycap>Ctrl</keycap> \n"
-"                 <keycap>O</keycap> \n"
-"             </keycombo>\n"
-"      to choose from a list of folders you'd like to visit, or use the\n"
-"      drop-down folder bar.  You can hide and show the folder bar and\n"
-"      the shortcut bar by selecting those items in the\n"
-"      <guimenu>View</guimenu> menu.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"      Si no le gusta la barra de atajos, puede usar la barra de carpetas\n"
-"      o la barra de menús para navegar a traves de la vetana principal.\n"
-"      Pulse \n"
-"            <keycombo action=\"simul\">\n"
-"                 <keycap>Ctrl</keycap> \n"
-"                 <keycap>O</keycap> \n"
-"             </keycombo>\n"
-"      para elegir de una lista la carpeta a la que quiere ir, o\n"
-"      use la barra de carpetas.  Puede ocultar y mostrar la barra de\n"
-"      carpetas y la barra de atajos seleccionando dichos elementos en el\n"
-"      menú <guimenu>Ver</guimenu>.\n"
-"    </para>\n"
-
-#: tmp/usage-mainwindow.sgml.h:247
-msgid ""
-"    <para>\n"
-"      Right-clicking will bring up a menu for just about anything\n"
-"      in GNOME, and <application>Evolution</application> is no\n"
-"      exception.  If you right-click on a folder, you'll have a\n"
-"      menu with the following options:\n"
-"      <itemizedlist>\n"
-"\t<listitem><para><guimenuitem>FIXME</guimenuitem>, for another purpose. </"
-"para></listitem>\n"
-"\t<listitem><para><guimenuitem>Something else</guimenuitem>, for another "
-"purpose. </para></listitem>\n"
-"      </itemizedlist>.\n"
-"    </para>\n"
-msgstr ""
-
-#: tmp/usage-mainwindow.sgml.h:258
-msgid ""
-"    <para>\n"
-"      The <interface>folder bar</interface> is a more comprehensive\n"
-"      way to view the information you've stored with\n"
-"      <application>Evolution</application>. It displays all your\n"
-"      appointments, address cards, and email in a tree that's a lot\n"
-"      like a <glossterm linkend=\"filetree\">file\n"
-"      tree</glossterm>&mdash; it starts small at the top, and branches\n"
-"      downwards. On most computers, there will be three or four\n"
-"      folders at the base.  First is the <guilabel>Local</guilabel>\n"
-"      folder, which holds all the <application>Evolution</application>\n"
-"      data that's stored on your computer.  After that come\n"
-"      <guilabel>Virtual Folders</guilabel>, or virtual folders, discussed "
-"in\n"
-"      <xref linkend=\"usage-mail-organize-vfolders\">, followed by any\n"
-"      <glossterm linkend=\"imap\">IMAP</glossterm> mail folders you may\n"
-"      have available to you over your network.  Lastly, there are\n"
-"      <guilabel>External Directories</guilabel>, <glossterm\n"
-"      linkend=\"ldap\">LDAP</glossterm> contact directories stored on a\n"
-"      network.\n"
-"    </para>\n"
-msgstr ""
-
-#: tmp/usage-mainwindow.sgml.h:278
-msgid ""
-"    <para>\n"
-"      The <interface>menu bar</interface>'s contents will always\n"
-"      provide all the possible actions for any given view of your\n"
-"      data.  That means that, depending on the context, menu bar items\n"
-"      will change.  If you're looking at your Inbox, most of the menu\n"
-"      items will relate to mail; some will relate to other components\n"
-"      of <application>Evolution</application> and some, especially\n"
-"      those in the <guimenu>File Menu</guimenu> will relate to the\n"
-"      application as a whole. The contents of the menu bar are\n"
-"      described in <xref linkend=\"menuref\">.\n"
-"   </para>\n"
-msgstr ""
-
-#: tmp/usage-mainwindow.sgml.h:290
-msgid ""
-"    <para>\n"
-"      To delete a folder, right-click it and select\n"
-"      <guimenuitem>Delete</guimenuitem> from the menu that pops up.\n"
-"      To change the order of folders, or put one inside another, use\n"
-"      drag-and-drop.  To move individual\n"
-"      messages, appointments, and address cards between folders, you\n"
-"      can do the same thing: drag them where you want them, and\n"
-"      they'll go.\n"
-"    </para>\n"
-msgstr ""
-
-#: tmp/usage-mainwindow.sgml.h:300
-msgid "    <title>Navigating without the Folder Bar</title>\n"
-msgstr "    <title>Navegando sin la Barra de Carpetas</title>\n"
-
-#: tmp/usage-mainwindow.sgml.h:302
-msgid "    <title>The Folder Bar</title>\n"
-msgstr "    <title>La Barra de Carpetas</title>\n"
-
-#: tmp/usage-mainwindow.sgml.h:304
-msgid "    <title>The Menu Bar</title>\n"
-msgstr "    <title>La Barra de Menú</title>\n"
-
-#: tmp/usage-mainwindow.sgml.h:306
-msgid "    <title>The Shortcut Bar</title>\n"
-msgstr "    <title>La Barra de Atajos</title>\n"
-
-#: tmp/usage-mainwindow.sgml.h:308
-msgid ""
-"   <para>\n"
-"      <variablelist>\n"
-"        <varlistentry>\n"
-"          <term> <guimenu>File</guimenu> Menu</term>\n"
-"\n"
-"          <listitem><para> \n"
-"            Anything even related to a file or to the operations\n"
-"            of the application generally  falls under this\n"
-"            menu: creating things, saving them to disk, \n"
-"            printing them, and quitting the program itself.  \n"
-"\n"
-"            </para></listitem>\n"
-"        </varlistentry>\n"
-"\n"
-"       <varlistentry>\n"
-"          <term> <guimenu>Edit</guimenu> Menu </term>\n"
-"          <listitem><para>\n"
-"              The <guimenu>Edit</guimenu> menu holds\n"
-"              useful tools that help you edit text and move it around.\n"
-"          </para></listitem>\n"
-"        </varlistentry>\n"
-"\n"
-"       <varlistentry>\n"
-"          <term> <guimenu>View</guimenu> Menu </term>\n"
-"          <listitem><para>\n"
-"            This menu lets you decide how <application>Evolution</"
-"application> \n"
-"            should look. Some of the features control the appearance of \n"
-"            <application>Evolution</application> as a whole, and others \n"
-"            the way a particular kind of information appears.\n"
-"          </para></listitem>\n"
-"        </varlistentry>\n"
-"\n"
-"        <varlistentry>\n"
-"          <term> <guimenu>Settings</guimenu> Menu </term>\n"
-"          <listitem><para> Tools for configuring, changing, and\n"
-"          setting up go here.  For mail, that means things like\n"
-"          <guimenuitem>Mail Configuration</guimenuitem> and the\n"
-"          <guimenuitem>Virtual Folder Editor</guimenuitem>.  For the\n"
-"          <interface>Calendar</interface> and the <interface>Contact\n"
-"          Manager</interface>, it's color, network, and layout\n"
-"          configuration. </para></listitem>\n"
-"        </varlistentry>\n"
-"\n"
-"       <varlistentry>\n"
-"          <term> <guimenu>Help</guimenu> Menu</term>\n"
-"          <listitem><para>\n"
-"             Select among these items to open the \n"
-"             <application>Help Browser</application> \n"
-"             and read the <application>Evolution</application> manual.\n"
-"          </para></listitem>\n"
-"        </varlistentry>\n"
-"      </variablelist>\n"
-"   </para>\n"
-msgstr ""
-
-#: tmp/usage-mainwindow.sgml.h:362
-msgid ""
-"   <para>\n"
-"      Once you've familiarized yourself with the <interface>main\n"
-"      window</interface> you can start doing things with it.  We'll\n"
-"      start with your email inbox, since you've got a letter waiting\n"
-"      for you already.\n"
-"    </para>\n"
-msgstr ""
-
-#: tmp/usage-mainwindow.sgml.h:369
-msgid ""
-"   <para>\n"
-"     After <application>Evolution</application> starts\n"
-"     up, you will see the <interface>main window</interface>, with the\n"
-"     <interface>Inbox</interface> open.  It should look a lot like the\n"
-"     picture in <xref linkend=\"usage-mainwindow-fig\">. On the left of\n"
-"     the <interface>main window</interface> is the <interface>shortcut\n"
-"     bar</interface>, with several buttons in it.  Just underneath the\n"
-"     title bar is a series of menus in the <interface>menu\n"
-"     bar</interface>, and below that, the <interface>tool\n"
-"     bar</interface> with buttons for different functions. The largest\n"
-"     part of the <interface>main window</interface> is taken up by the\n"
-"     actual <interface>Inbox</interface>, where messages are listed\n"
-"     and displayed.  If you're running the program for the first time,\n"
-"     you'll have just one message: a welcome from Ximian.\n"
-"\n"
-"\n"
-"<!-- ==============Figure=================================== -->\n"
-"    <figure id=\"usage-mainwindow-fig\">\n"
-"    <title>Evolution Main Window and Inbox</title>\n"
-"    <screenshot>\n"
-"      <screeninfo>Evolution Main Window</screeninfo>\n"
-"      <graphic fileref=\"fig/mainwindow-pic\" format=\"png\" srccredit="
-"\"Kevin Breit\">\n"
-"\t</graphic>\n"
-"    </screenshot>\n"
-"    </figure>\n"
-"<!-- ==============End of Figure=================================== -->\n"
-"</para>\n"
-msgstr ""
-
-#: tmp/usage-mainwindow.sgml.h:397
-msgid ""
-"   <para>\n"
-"     Other menus, like <guilabel>Folder</guilabel>,\n"
-"     <guilabel>Message</guilabel>, and <guilabel>Actions</guilabel>,\n"
-"     appear only occasionally.  <guilabel>Message</guilabel> and\n"
-"     <guilabel>Folder</guilabel>, for example, have commands that only\n"
-"     relate to email, so they're only available when you're looking at\n"
-"     email.\n"
-"   </para>\n"
-msgstr ""
-
-#: tmp/usage-mainwindow.sgml.h:406
-msgid ""
-"   <para>\n"
-"    <note>\n"
-"      <title>The Way Evolution Looks</title>\n"
-"      <para>\n"
-"\tThe appearance of both <application>Evolution</application>\n"
-"\tand <application>GNOME</application> is very easy to\n"
-"\tcustomize, so your screen might not look like this picture.\n"
-"\tYou might decide to have <application>Evolution</application>\n"
-"\tstart with the calendar and a folder bar, or with the contact\n"
-"\tmanager occupying the entire window.\n"
-"      </para>\n"
-"    </note>\n"
-"  </para>\n"
-msgstr ""
-
-#: tmp/usage-mainwindow.sgml.h:420
-msgid ""
-"  <para>\n"
-"     Start <application>Evolution</application> by selecting\n"
-"     <menuchoice><guimenu>Main Panel Menu</guimenu>\n"
-"     <guisubmenu>Applications</guisubmenu>\n"
-"     <guimenuitem>Evolution</guimenuitem></menuchoice> or by typing\n"
-"     <command>evolution</command> at the command line.  The first time\n"
-"     you run the program, it will create a directory called\n"
-"     <filename>evolution</filename> in your home directory, where it\n"
-"     will keep all your <application>Evolution</application>-related\n"
-"     files.\n"
-"   </para>\n"
-msgstr ""
-
-#: tmp/usage-mainwindow.sgml.h:432
-msgid "  <title>The Main Window: Evolution Basics</title>\n"
-msgstr ""
-"  <title>La Ventana Principal: Conceptos Básicos de Evolution</title>\n"
-
-#: tmp/usage-mainwindow.sgml.h:434
-msgid ""
-"<!--\n"
-" <!DOCTYPE Chapter PUBLIC \"-//GNOME//DTD DocBook PNG Variant V1.1//EN\">\n"
-"-->\n"
-msgstr ""
-"<!--\n"
-" <!DOCTYPE Chapter PUBLIC \"-//GNOME//DTD DocBook PNG Variant V1.1//EN\">\n"
-"-->\n"
diff --git a/help/es.po/usage-notes.sgml.po b/help/es.po/usage-notes.sgml.po
deleted file mode 100644
index d26eb63c56..0000000000
--- a/help/es.po/usage-notes.sgml.po
+++ /dev/null
@@ -1,111 +0,0 @@
-# Translation into Spanish of Evolution docs.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Héctor García Álvarez <hector@scouts-es.org>, 2000.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution-docs\n"
-"POT-Creation-Date: 2001-04-20 13:43+0200\n"
-"PO-Revision-Date: 2000-12-28 15:38+0100\n"
-"Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: tmp/usage-notes.sgml.h:1
-msgid ""
-"    <para>\n"
-"      In the dark ages before email was invented, there were little\n"
-"      scraps of people which people used for short-term information\n"
-"      storage.  These scraps of paper were called notes.  Now, notes\n"
-"      are an almost necessary part of our lives, albeit in electronic\n"
-"      form.  It only makes sense, then, that\n"
-"      <application>Evolution</application> will eventually have a\n"
-"      Notes feature.  <application>Evolution</application> can help\n"
-"      you take notes in the following ways:\n"
-"     <itemizedlist>\n"
-"       <listitem>\n"
-"         <para>\n"
-"           Take down phone numbers, take school notes, take phone\n"
-"\t   messages, or even write poetry.\n"
-"         </para>\n"
-"       </listitem>\n"
-"       <listitem>\n"
-"         <para>\n"
-"           Color code notes to organize them, or just to\n"
-"           make them look good.\n"
-"         </para>\n"
-"       </listitem>\n"
-"       <listitem>\n"
-"         <para>\n"
-"           Turn a note into an email or a text file.\n"
-"         </para>\n"
-"       </listitem>\n"
-"       <listitem>\n"
-"         <para>\n"
-"           Write <glossterm>Haiku</glossterm>\n"
-"         </para>\n"
-"       </listitem>\n"
-"     </itemizedlist>\n"
-"   </para>\n"
-msgstr ""
-"    <para>\n"
-"      En la edad oscura antes de que el correo electrónico fuera inventado,\n"
-"      habia pequeños trozos de papel que la gente usaba para guardar\n"
-"      información que se necesitaba durante poco tiempo. A estos trozos de\n"
-"      papel se les llamó notas.  Ahora, las notas son casi una parte\n"
-"      necesaria de nuestras vidas, aunque ahora en formato electrónico.\n"
-"      Tiene sentido, entonces, que <application>Evolution</application>\n"
-"      eventualmente tenga una función de notas.\n"
-"      <application>Evolution</application> le ayuda a tomar notas de la\n"
-"      siguientes formas:\n"
-"     <itemizedlist>\n"
-"       <listitem>\n"
-"         <para>\n"
-"           Apunte números de teléfono, notas de la escuela, tome notas de\n"
-"\t   mensajes telefónicos, o incluso escriba poesía.\n"
-"         </para>\n"
-"       </listitem>\n"
-"       <listitem>\n"
-"         <para>\n"
-"           Un código de colores para las notas pra poder organizarlas, o\n"
-"           simplemente para que tengan una apariencia bonita.\n"
-"         </para>\n"
-"       </listitem>\n"
-"       <listitem>\n"
-"         <para>\n"
-"           Convierta una nota en un mensaje electrónico o en un archivo de "
-"texto.\n"
-"         </para>\n"
-"       </listitem>\n"
-"       <listitem>\n"
-"         <para>\n"
-"           Escriba <glossterm>Haiku</glossterm>\n"
-"         </para>\n"
-"       </listitem>\n"
-"     </itemizedlist>\n"
-"   </para>\n"
-
-#: tmp/usage-notes.sgml.h:36
-msgid "    <title> An Overview of the Evolution Notes</title>\n"
-msgstr "    <title> Una Vista General de las Notas de Evolution</title>\n"
-
-#: tmp/usage-notes.sgml.h:38
-msgid ""
-"   <para>\n"
-"     You can start writing notes by clicking\n"
-"     <guibutton>Notes</guibutton> in the shortcut bar.  Of course,\n"
-"     it's not there yet. But when it is, it'll take you to the\n"
-"     notepad.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"     Puede comenzar a escribir notas pulsando sobre\n"
-"     <guibutton>Notas</guibutton> en la barra de atajos.  Naturalmente,\n"
-"     todavia no está ahí. Pero cuando esté, le llevara al editor.\n"
-"   </para>\n"
-
-#: tmp/usage-notes.sgml.h:45
-msgid "  <title>Evolution Notes</title>\n"
-msgstr "  <title>Notas de Evolution</title>\n"
diff --git a/help/es.po/usage-print.sgml.po b/help/es.po/usage-print.sgml.po
deleted file mode 100644
index 29abf423a1..0000000000
--- a/help/es.po/usage-print.sgml.po
+++ /dev/null
@@ -1,196 +0,0 @@
-# Translation into Spanish of Evolution docs.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Héctor García Álvarez <hector@scouts-es.org>, 2000.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution-docs\n"
-"POT-Creation-Date: 2001-04-20 13:43+0200\n"
-"PO-Revision-Date: 2000-12-28 15:38+0100\n"
-"Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: tmp/usage-print.sgml.h:1
-msgid "\t  <title>Choosing a Printer</title>\n"
-msgstr "\t  <title>Eligiendo una Impresora</title>\n"
-
-#: tmp/usage-print.sgml.h:3
-msgid "\t  <title>Print Preview</title>\n"
-msgstr "\t  <title>Vista Previa de la Impresión</title>\n"
-
-#: tmp/usage-print.sgml.h:5
-msgid ""
-"    <para>\n"
-"       The printer selection window, shown in <xref\n"
-"       linkend=\"print-dest\">, lets you choose the format for\n"
-"       printing&mdash; at this time, only <guilabel>Generic\n"
-"       Postscript</guilabel> is available&mdash; and whether to print\n"
-"       to a file or to an actual printer.  If you choose a printer,\n"
-"       you'll be asked for the printer command (probably\n"
-"       <guilabel>lpr</guilabel>) which your system uses.  If you\n"
-"       choose to print to a file, you'll need to decide upon a\n"
-"       filename.  And of course, you'll want to choose a number of\n"
-"       copies, and whether to collate them.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"       La ventana de selección de impresora, mostrada en <xref\n"
-"       linkend=\"print-dest\">, le permite elegir el formato de\n"
-"       impresión&mdash; en estos momentos, solo está disponible\n"
-"       <guilabel>Postscript Genérico</guilabel>&mdash; y si imprimir a un\n"
-"       archivo o a una impresora.  Si elige una impresora,\n"
-"       le pedirá el comando que use su sistema para la impresora\n"
-"       (probablemente <guilabel>lpr</guilabel>).  Si decide imprimir en un\n"
-"       archivo, debe decidir el nombre.  Y naturalmente, debe decidor el\n"
-"       número de copias, y si deben ir o no intercaladas.\n"
-"    </para>\n"
-
-#: tmp/usage-print.sgml.h:18
-msgid ""
-"    <para>\n"
-"      <guibutton>Print Preview</guibutton> appears both as a button in\n"
-"      the printing dialog and as an item in the\n"
-"      <guimenu>File</guimenu> menu.  In both places, it does the same\n"
-"      thing: it opens a new window that shows you what would happen if\n"
-"      you were to print the current message, calendar, appointment, or\n"
-"      address card.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"      <guibutton>Vista Previa</guibutton> aparece como un botón en\n"
-"      el diálogo de impresión y como una opción en el menú\n"
-"      <guimenu>Archivo</guimenu>.  En ambos sitios, hace lo mismo:\n"
-"      abre una nueva ventana que le muestra que pasaría si imprimiese\n"
-"      el mensaje, el calendario, la cita, o la tarjeta de actual.\n"
-"    </para>\n"
-
-#: tmp/usage-print.sgml.h:27
-msgid ""
-"    <para>\n"
-"      That window allows you to select which pages you want to see,\n"
-"      and how close you'd like to look at them.  Zoom in or out, fit\n"
-"      the page to the window (the <guibutton>Fit</guibutton> button)\n"
-"      or match the width of the page and the window (the\n"
-"      <guibutton>Fit Width</guibutton> button).  None of these buttons\n"
-"      changes the way the page will be printed, but they do let you\n"
-"      get a better look.  If you're satisfied with the way the things\n"
-"      look, click <guibutton>Print</guibutton> to send your document\n"
-"      on its way.  If you'd like to change it, just close the\n"
-"      <guilabel>Print Preview</guilabel> window and make the changes\n"
-"      you want from the Mail, Calendar, or Contact Manager.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"      Esa ventana le permite sleccionar que páginas quiere ver,\n"
-"      y como de cerca quiere verlas.  Aumentar o disminuir el zoom,\n"
-"      ajustar la página a la ventana (el botón <guibutton>Ajustar</"
-"guibutton>)\n"
-"      o igualar el ancho del papel con el de la ventana (el botón\n"
-"      <guibutton>Ajustar Ancho</guibutton>).  Ninguno de estos botones\n"
-"      modifica la manera en que se imprimen las páginas, pero le permiten\n"
-"      verlas mejor.  Si está satisfecho con el aspecto que tienen, pulse\n"
-"      <guibutton>Imprimir</guibutton> para enviar su documento a su "
-"destino.\n"
-"      Si quisiera cambiarlo, cierre la ventana de la\n"
-"      <guilabel>Vista Previa</guilabel> y haga los cambios que quiera\n"
-"      en el Correo, el Calendario, o el Administrador de Contactos.\n"
-"    </para>\n"
-
-#: tmp/usage-print.sgml.h:41
-msgid ""
-"    <para>\n"
-"      When you're ready, click <guibutton>Print</guibutton> to print,\n"
-"      <guibutton>Preview</guibutton> to have a look (or another look)\n"
-"      at the preview, or <guibutton>Cancel</guibutton> to cancel the\n"
-"      whole deal.\n"
-"    </para>\n"
-msgstr ""
-"    <para>\n"
-"     Cuando este listo, pulse <guibutton>Imprimir</guibutton> para "
-"imprimir,\n"
-"     <guibutton>Vista Previa</guibutton> para echar un vistazo (u otro más)\n"
-"     a la vista previa, o <guibutton>Cancelar</guibutton> para cancelarlo\n"
-"     todo.\n"
-"    </para>\n"
-
-#: tmp/usage-print.sgml.h:48
-msgid "    <title>File or Printer?</title>\n"
-msgstr "    <title>¿Archivo o Impresora?</title>\n"
-
-#: tmp/usage-print.sgml.h:50
-msgid "    <title>Print Preview</title>\n"
-msgstr "    <title>Vista Previa de la Impresión</title>\n"
-
-#: tmp/usage-print.sgml.h:52
-msgid ""
-"   <para>\n"
-"     If you're printing a message that's more than one page, you'll\n"
-"     have the option of choosing which pages to print.  If you're\n"
-"     printing a calendar entry, you can decide what range of dates to\n"
-"     print.  And, if you're printing contact cards, you can decide\n"
-"     whether to print only the selected cards, or all of them.\n"
-"   </para>\n"
-msgstr ""
-"   <para>\n"
-"     Si está imprimiendo un mensaje que ocupa más de una página, tiene la\n"
-"     opción de elegir que páginas imprimir.  Si está imprimiendo las\n"
-"     entradas de un calendario, puede decidir el rango de fechas a "
-"imprimir.\n"
-"     Y, si está imprimiendo tarjetas, puede decidir si imprimir solo las\n"
-"     seleccionadas, o todas ellas.\n"
-"   </para>\n"
-
-#: tmp/usage-print.sgml.h:60
-msgid " <!-- ==============Figure=================================== -->\n"
-msgstr " <!-- ==============Figure=================================== -->\n"
-
-#: tmp/usage-print.sgml.h:62
-msgid "<!-- ==============End of Figure============================== -->\n"
-msgstr "<!-- ==============End of Figure============================== -->\n"
-
-#: tmp/usage-print.sgml.h:64
-msgid ""
-"<para>\n"
-"  This is a very short chapter, because printing with\n"
-"  <application>Evolution</application> is not a complex task.  Like\n"
-"  most GNOME applications, <application>Evolution</application> uses\n"
-"  the gnome-print system, so if you've used any other GNOME\n"
-"  application to print, you should be able to print from\n"
-"  <application>Evolution</application> immediately.\n"
-"</para>\n"
-msgstr ""
-"<para>\n"
-"  Este es un capítulo muy corto, porque imprimir con\n"
-"  <application>Evolution</application> no es unatarea complicada.  Como\n"
-"  la mayoría de las aplicaciones GNOME, <application>Evolution</"
-"application>\n"
-"  usa el sistema gnome-print, así que si ha usado otra aplicación GNOME\n"
-"  para imprimir, debería sera capaz de imprimir inmeditamente en\n"
-"  <application>Evolution</application>.\n"
-"</para>\n"
-
-#: tmp/usage-print.sgml.h:73
-msgid ""
-"<para>\n"
-"  Whether you're printing a message, a calendar page, or a selection\n"
-"  of address cards, you can choose to print directly to a printer, or\n"
-"  save the print output to a postscript file.  You can also use the\n"
-"  preview feature to see how your printed output will look.\n"
-"</para>\n"
-msgstr ""
-"<para>\n"
-"  Tanto si esta imprimiendo un mensaje, una pagina del  calendario, o una\n"
-"  selección de tarjetas de visita, puede elegir entre imprimirlo "
-"directamente\n"
-"  en la impresora, o guardar la salida de la impresión en un archivo\n"
-"  postscript.  También puede usar la característica de vista previa para "
-"ver\n"
-"  como será la salida.\n"
-"</para>\n"
-
-#: tmp/usage-print.sgml.h:80
-msgid "<title>Printing with Evolution</title>\n"
-msgstr "<title>Imprimiendo con Evolution</title>\n"
diff --git a/help/es.po/usage-sync.sgml.po b/help/es.po/usage-sync.sgml.po
deleted file mode 100644
index b6a2c541a3..0000000000
--- a/help/es.po/usage-sync.sgml.po
+++ /dev/null
@@ -1,60 +0,0 @@
-# Translation into Spanish of Evolution docs.
-# Copyright (C) 2000 Free Software Foundation, Inc.
-# Héctor García Álvarez <hector@scouts-es.org>, 2000.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: evolution-docs\n"
-"POT-Creation-Date: 2001-04-20 13:43+0200\n"
-"PO-Revision-Date: 2000-12-28 15:38+0100\n"
-"Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: tmp/usage-sync.sgml.h:1
-msgid ""
-"        <para>\n"
-"          Put your hand-held device on its cradle and press the\n"
-"          HotSync button.\n"
-"        </para>\n"
-msgstr ""
-"        <para>\n"
-"          Ponga su dispositivo de mano en su cuna y apriete el botón\n"
-"          de sincronización.\n"
-"        </para>\n"
-
-#: tmp/usage-sync.sgml.h:6
-msgid ""
-"        <para>\n"
-"         No, really.  That's all there is to it.\n"
-"        </para>\n"
-msgstr ""
-"        <para>\n"
-"         No, de verdad.  Esto es todo lo que hay que hacer.\n"
-"        </para>\n"
-
-#: tmp/usage-sync.sgml.h:10
-msgid "        <title>Using HotSync</title>\n"
-msgstr "        <title>Usando la Sincronización</title>\n"
-
-#: tmp/usage-sync.sgml.h:12
-msgid ""
-"      <para>\n"
-"        This chapter covers is how to synchronize data \n"
-"        installed and configured.  If you need information on how to\n"
-"        set up a synchronization system, consult <xref\n"
-"        linkend=\"config-sync\">.\n"
-"      </para>\n"
-msgstr ""
-"      <para>\n"
-"        Este capítulo cubre como sincronizar datos una vez instalado y \n"
-"        configurado.  Si necesita información sobre como preparar un\n"
-"        sistema de sincronización, consulte <xref\n"
-"        linkend=\"config-sync\">.\n"
-"      </para>\n"
-
-#: tmp/usage-sync.sgml.h:19
-msgid "      <title>Synchronizing with a Hand-held Device</title>\n"
-msgstr "      <title>Sincronizando con un Dispositivo de mano</title>\n"
diff --git a/help/es/Makefile.in b/help/es/Makefile.in
deleted file mode 100644
index dee738f8c3..0000000000
--- a/help/es/Makefile.in
+++ /dev/null
@@ -1,321 +0,0 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ../..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-AS = @AS@
-BONOBO_GNOME_CFLAGS = @BONOBO_GNOME_CFLAGS@
-BONOBO_GNOME_LIBS = @BONOBO_GNOME_LIBS@
-BONOBO_HTML_GNOME_CFLAGS = @BONOBO_HTML_GNOME_CFLAGS@
-BONOBO_HTML_GNOME_LIBS = @BONOBO_HTML_GNOME_LIBS@
-BONOBO_VFS_GNOME_CFLAGS = @BONOBO_VFS_GNOME_CFLAGS@
-BONOBO_VFS_GNOME_LIBS = @BONOBO_VFS_GNOME_LIBS@
-CAPPLET_LIBS = @CAPPLET_LIBS@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CPP = @CPP@
-DATADIRNAME = @DATADIRNAME@
-DLLTOOL = @DLLTOOL@
-EVOLUTION_DIR = @EVOLUTION_DIR@
-EXTRA_GNOME_CFLAGS = @EXTRA_GNOME_CFLAGS@
-EXTRA_GNOME_LIBS = @EXTRA_GNOME_LIBS@
-GENCAT = @GENCAT@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_LIBS = @GLIB_LIBS@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GNOMEGNORBA_LIBS = @GNOMEGNORBA_LIBS@
-GNOMEUI_LIBS = @GNOMEUI_LIBS@
-GNOME_APPLETS_LIBS = @GNOME_APPLETS_LIBS@
-GNOME_CAPPLET_LIBS = @GNOME_CAPPLET_LIBS@
-GNOME_CONFIG = @GNOME_CONFIG@
-GNOME_DOCKLETS_LIBS = @GNOME_DOCKLETS_LIBS@
-GNOME_INCLUDEDIR = @GNOME_INCLUDEDIR@
-GNOME_LIBDIR = @GNOME_LIBDIR@
-GNOME_LIBS = @GNOME_LIBS@
-GNOME_PILOT_CFLAGS = @GNOME_PILOT_CFLAGS@
-GNOME_PILOT_LIBS = @GNOME_PILOT_LIBS@
-GNOME_PRINT_CFLAGS = @GNOME_PRINT_CFLAGS@
-GNOME_PRINT_LIBS = @GNOME_PRINT_LIBS@
-GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@
-GNOME_VFS_LIBS = @GNOME_VFS_LIBS@
-GNOME_XML_CFLAGS = @GNOME_XML_CFLAGS@
-GNOME_XML_LIB = @GNOME_XML_LIB@
-GNORBA_CFLAGS = @GNORBA_CFLAGS@
-GNORBA_LIBS = @GNORBA_LIBS@
-GPG = @GPG@
-GTKDOC = @GTKDOC@
-GTKHTML_CFLAGS = @GTKHTML_CFLAGS@
-GTKHTML_LIBS = @GTKHTML_LIBS@
-GTKXMHTML_LIBS = @GTKXMHTML_LIBS@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_CONFIG = @GTK_CONFIG@
-GTK_HTML_EDITOR_IDL = @GTK_HTML_EDITOR_IDL@
-GTK_LIBS = @GTK_LIBS@
-GT_NO = @GT_NO@
-GT_YES = @GT_YES@
-HAVE_GTK_DOC = @HAVE_GTK_DOC@
-INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
-INSTOBJEXT = @INSTOBJEXT@
-INTLDEPS = @INTLDEPS@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-KRB4_CFLAGS = @KRB4_CFLAGS@
-KRB4_LDFLAGS = @KRB4_LDFLAGS@
-KRB5_CFLAGS = @KRB5_CFLAGS@
-KRB5_LDFLAGS = @KRB5_LDFLAGS@
-LDAP_LIBS = @LDAP_LIBS@
-LEX = @LEX@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-OAF_CFLAGS = @OAF_CFLAGS@
-OAF_CONFIG = @OAF_CONFIG@
-OAF_LIBS = @OAF_LIBS@
-OBJDUMP = @OBJDUMP@
-ORBIT_CFLAGS = @ORBIT_CFLAGS@
-ORBIT_CONFIG = @ORBIT_CONFIG@
-ORBIT_IDL = @ORBIT_IDL@
-ORBIT_LIBS = @ORBIT_LIBS@
-PACKAGE = @PACKAGE@
-PGP = @PGP@
-PGP5 = @PGP5@
-PILOT_BINS = @PILOT_BINS@
-PILOT_LIBS = @PILOT_LIBS@
-PISOCK_INCLUDEDIR = @PISOCK_INCLUDEDIR@
-PISOCK_LIBDIR = @PISOCK_LIBDIR@
-PISOCK_LIBS = @PISOCK_LIBS@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PTHREAD_LIB = @PTHREAD_LIB@
-PURIFY = @PURIFY@
-RANLIB = @RANLIB@
-SENDMAIL = @SENDMAIL@
-THREADS_CFLAGS = @THREADS_CFLAGS@
-THREADS_LIBS = @THREADS_LIBS@
-UNICODE_CFLAGS = @UNICODE_CFLAGS@
-UNICODE_LIBS = @UNICODE_LIBS@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-XPM_LIBS = @XPM_LIBS@
-YACC = @YACC@
-ZVT_LIBS = @ZVT_LIBS@
-cflags_set = @cflags_set@
-cxxflags_set = @cxxflags_set@
-l = @l@
-localedir = @localedir@
-
-evolution_helpdir = $(datadir)/gnome/help/evolution/C
-
-SGML_FILES =  	apx-authors.sgml		apx-bugs.sgml			apx-fdl.sgml			apx-gloss.sgml			config-prefs.sgml		config-setupassist.sgml		config-sync.sgml		evolution-guide.sgml		preface.sgml			usage-calendar.sgml		usage-contact.sgml		usage-mail.sgml			usage-mainwindow.sgml		usage-sync.sgml
-
-
-EXTRA_DIST =  	$(SGML_FILES)
-
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/C/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = doc/C
-
-distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/C/Makefile
-	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-data-local
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-all: evolution-guide
-
-evolution-guide: $(SGML_FILES)
-	-db2html evolution-guide.sgml
-
-dist-hook:
-	mkdir $(distdir)/evolution-guide
-	-cp evolution-guide/*.html evolution-guide/*.css $(distdir)/evolution-guide
-	mkdir $(distdir)/fig
-	-cp fig/*.png $(distdir)/fig
-	mkdir $(distdir)/evolution-guide/stylesheet-images
-	-cp evolution-guide/stylesheet-images/* $(distdir)/evolution-guide/stylesheet-images
-
-install-data-local: evolution-guide
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)
-	-for file in $(srcdir)/evolution-guide/*.html $(srcdir)/evolution-guide/*.css; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/$$basefile; \
-	done
-
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/fig
-	-for file in $(srcdir)/fig/*.png; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/fig/$$basefile; \
-	done
-
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/stylesheet-images
-	-for file in $(srcdir)/evolution-guide/stylesheet-images/*; do \
-		basefile=`basename $$file`; \
-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/stylesheet-images/$$basefile; \
-	done
-
-evolution.ps: evolution.sgml
-	-db2ps $<
-
-evolution.rtf: evolution.sgml	
-	-db2rtf $<
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/help/es/apx-authors.sgml b/help/es/apx-authors.sgml
deleted file mode 100644
index 8af980555f..0000000000
--- a/help/es/apx-authors.sgml
+++ /dev/null
@@ -1,75 +0,0 @@
-  <appendix id="authors">
-    <title>Autores</title>
-     <para>
-      <application>Evolution</application> ha sido escrita por:
-<simplelist>
-     <member>Seth Alves: <email>alves@helixcode.com</email></member>
-     <member>Anders Carlsson: <email>andersca@gnu.org</email></member>
-     <member>Damon Chaplin: <email>damon@helixcode.com</email></member>
-     <member>Clifford R. Conover: <email>rusty@zootweb.com</email></member>
-     <member>Miguel De Icaza: <email>miguel@helixcode.com</email></member>
-     <member> Radek Doulik: <email>rodo@helixcode.com</email></member>
-     <member>Arturo Espinoza: <email>arturo@nucleu.unam.mx</email></member>
-     <member>Larry Ewing: <email>lewing@helixcode.com</email></member>
-     <member>Bertrand Guiheneuf: <email>bertrand@helixcode.com</email></member>
-     <member>Tuomas Kuosmanen: <email>tigert@gimp.org</email></member>
-     <member>Christopher J. Lahey: <email>clahey@helixcode.com</email></member>
-     <member>Matthew Loper: <email>matt@loper.org</email></member>
-     <member>Federico Mena: <email>federico@helixcode.com</email></member>
-     <member>Eskil Heyn Olsen: <email>deity@eski.dk</email></member>
-     <member>Nat Friedman: <email>nat@helixcode.com</email></member>
-     <member>Ettore Perazzoli: <email>ettore@helixcode.com</email></member>
-     <member>Jeffrey Stedfast: <email>jeff@helixcode.com</email></member>
-     <member>Russell Steinthal: <email>rms39@columbia.edu</email></member>     
-     <member>Peter Teichman: <email>peter@helixcode.com</email></member>     
-     <member>Chris Toshok: <email>toshok@helixcode.com</email></member>
-     <member>Peter Williams: <email>peter@newton.cx</email></member>
-     <member>Dan Winship: <email>danw@helixcode.com</email></member>
-     <member>Michael Zucchi: <email>notzed@helixcode.com</email></member>
-</simplelist>
-y otros dedicados programadores de GNOME. 
-</para>
-    <para>
-      El código de <application>Evolution</application> debe mucho a las
-       aplicaciones <application>GNOME-pim</application> y
-       <application>GNOME-Calendar</application>, y a
-       <application>KHTMLW</application>.  Los desarrolladores de
-       <application>Evolution</application> reconocen los esfuerzos y
-       contribuciones de todos los que ha trabajado en dichos proyectos.
-    </para>
-
-   <para>
-      Para más información por favor visite la 
-      <ulink url="http://www.helixcode.com/apps/evolution.php3"
-      type="http">página web</ulink> de <application>Evolution
-      </application>. Por favor envíe todos los comentarios,
-      sugerencias, y reportes de fallo al <ulink
-      url="http://bugs.gnome.org" type="http">sistema de seguimiento de
-      fallos de GNOME</ulink>. Las instrucciones para hacer reportes de
-      fallos se pueden encontrar en línea en <ulink
-      url="http://bugs.gnome.org/Reporting.html" type="http">
-      http://bugs.gnome.org/Reporting.html</ulink>. También puede usar el
-      comando <command>bug-buddy</command> para enviar reportes de fallo.
-    </para>
-    <para>
-      Este manual ha sido escrito por Aaron Weber
-      (<email>aaron@helixcode.com</email>) y Kevin Breit
-      (<email>battery841@mypad.com</email>) con la ayuda de los
-      programadores de la aplicación y el proyecto de documentación de
-      GNOME. Por favor envíe todos sus comentarios y sugerencias acerca de
-      este manual al proyecto de documentación de GNOME a
-      <email>docs@gnome.org</email>. También puede enviar comentarios a
-      del web usando la <ulink type="http"
-      url="http://www.gnome.org/gdp/doctable/">Tabla de Estado de la
-      Documentación de GNOME</ulink> (está en ingles).
-    </para>
-    <para> Traducción al español realizada por
-      Héctor García Álvarez (<email>hector@scouts-es.org</email>). 
-      Por favor envíe todos los comentarios y sugerencias sobre esta 
-      traducción a <email>hector@debian.org</email>.  </para>
-    </appendix>
-
-
-
-
-
diff --git a/help/es/apx-bugs.sgml b/help/es/apx-bugs.sgml
deleted file mode 100644
index 544387481e..0000000000
--- a/help/es/apx-bugs.sgml
+++ /dev/null
@@ -1,23 +0,0 @@
- <appendix id="bugs">
-   
-    <title>Errores y limitaciones conocidas</title>
-    <abstract>
-    <para>
-     Este apéndice describe errores y limitaciones conocidas de
-    <application>Evolution</application>.  Por favor use la
-    <application>Herramienta de reporte de fallos</application> de GNOME
-    (<command>bug-buddy</command> en la línea de comandos) si encuentra
-    algún error que no este en esta lista.
-    </para>
-    </abstract>
-
-    <para>
-      Evolution todavía es software en fase beta, así que el seguimiento
-      de errores es mejor dejárselo al sistema bugzilla y a los 
-      programadores.  Eso sí, hay cierto número de limitaciones que
-      no serán corregidas antes de la versión 1.0. Las más notables son: 
-      Importación de los archivos .pst de Microsoft Outlook, y la
-      compatibilidad con el protocolo de Microsoft Exchange.
-    </para>
-  </appendix>
-
diff --git a/help/es/apx-gloss.sgml b/help/es/apx-gloss.sgml
deleted file mode 100644
index dd7c1b50e1..0000000000
--- a/help/es/apx-gloss.sgml
+++ /dev/null
@@ -1,462 +0,0 @@
-<glossary id="apx-gloss">
-
- <title>Glosario</title>
-
- <glossentry id="attachment">
-  <glossterm>Adjunto</glossterm>
-  <glossdef>
-   <para>
-    Cualquier archivo enviado junto con el mensaje de correo.  Los adjuntos
-    pueden estar insertados dentro del mensaje o añadidos a el.
-   </para>
-  </glossdef>
- </glossentry>
-
-<glossentry id="automatic-indexing">
-  <glossterm>Indexado Automático</glossterm>
-  <glossdef>
-   <para>
-     El procedimiento de pre-ordenado que permite a
-     <application>Evolution</application> encontrar la información
-     rápidamente.  Permite búsquedas más rápidas y disminuye el uso de la
-     memoria para mostrar datos.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="bcc">
-  <glossterm>Cco (Con Copia Oculta)</glossterm>
-  <glossdef>
-   <para>
-    Una manera de dirigir un mensaje.  Bcc es usado para enviar un mensaje
-    a un grupo de personas, a la vez que se ocultan los nombres y
-    direcciones de unos a los otros.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="cc">
-  <glossterm>Cc (Con Copia)</glossterm>
-  <glossdef>
-   <para>
-    Con-Copia es usado para enviar una copia del mensaje a una 3º persona,
-    para que puedan enterarse de la conversación, sin estar en la lista de
-    A:
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="conduit">
-  <glossterm>Enlaze</glossterm>
-  <glossdef>
-   <para>
-     Un enlaze de sincronización es una pequeña aplicación que controla la
-     transferencia de información entre un dispositivo de mano y un
-     ordenador.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="druid">
-  <glossterm>Ayudante</glossterm>
-  <glossdef>
-   <para>
-    Una herramienta que guía al usuario a través de una serie de pasos,
-    normalmente para configurar un programa.  Equivalente a "Asistente"
-    y "Wizard".
-   </para>
-  </glossdef>
- </glossentry>
-
-<glossentry id="emoticon">
-  <glossterm>Emoticon</glossterm>
-  <glossdef>
-   <para>
-     También llamados "smileys", los emoticones son pequeñas caras puestas
-     de lado echas de puntos y paréntesis que la gente usa para expresar
-     emociones en los correos electrónicos. Ejemplos: :-) ó ;(  .
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="evolution">
-  <glossterm>Evolution</glossterm>
-  <glossdef>
-   <para>
-    <application>Evolution</application> es la aplicación de trabajo en
-    grupo de <acronym>GNOME</acronym>.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="execute">
-  <glossterm>Ejecutar</glossterm>
-  <glossdef>
-   <para>
-    Para ejecutar un programa.  Cualquier archivo que se puede ejecutar
-    se llama ejecutable.  <application>Evolution</application> puede
-    descargar ejecutables adjuntos, pero antes de poder ejecutarlos, el
-    archivo debe ser marcado como ejecutable a través de una shell o un
-    administrador de archivos.  Esta precaución de seguridad previene contra
-    la ejecución automática o accidental de programas maliciosos. Para más
-    información acerca de archivos ejecutables y permisos de archivos,
-    consulte la documentación de su administrador de archivos o de su shell.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="filetree">
-  <glossterm>Árbol de Archivos</glossterm>
-  <glossdef>
-   <para>
-     Un forma de describir un conjunto de archivos en un ordenador.  Con
-     la especial perversión de la típica nomenclatura de ordenadores
-     (y especialmente en Unix y Linux), la parte más alta del árbol se
-     llama el directorio raíz, y se denota por <systemitem><filename>/
-     </filename></systemitem>.  El resto de las "ramas" se extienden
-     desde la raíz.  No confundir el directorio raíz (root en ingles) con
-     la cuenta <systemitem>root</systemitem>, o con el directorio del
-     usuario root, <systemitem><filename>/home/root</filename></systemitem>.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="filter">
-  <glossterm>Filtro</glossterm>
-  <glossdef>
-   <para>
-    Dentro de <application>Evolution</application>, un filtro es un método
-    para ordenar el correo automáticamente.  Puede crear filtros para
-    realizar una o más acciones sobre un mensaje que cumple alguno (o todos)
-    de los requisitos de un amplio rango de criterios.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="forward">
-  <glossterm>Reenviar</glossterm>
-  <glossdef>
-   <para>
-       el usuario puede enviar un mensaje a una tercera persona    que originalmente le fue enviado a el.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="groupware">
- <glossterm>Trabajo en Grupo</glossterm>
-  <glossdef>
-   <para>
-    Trabajo en Grupo es un término que describe la aplicación que ayuda a
-    grupos de persones a trabajar juntas.  Típicamente, esta aplicación
-    varias herramientas de productividad integradas en un mismo programa.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="haiku">
-  <glossterm>Haiku</glossterm>
-  <glossdef>
-   <para>
-     Una forma de poesía tradicional japonesa.  Los poemas son de tres
-     líneas, donde la primera y la última tienen cinco sílabas, y la
-     segunda línea tiene siete sílabas.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="html">
-  <glossterm>HTML</glossterm>
-  <glossdef>
-   <para>
-    Lenguaje de Marcas de Hyper-texto (<acronym>HTML</acronym>) es un
-    lenguaje para describir la forma de la página en documentos electrónicos
-    como páginas web, archivos de ayuda, y mensajes de correo.  El HTML se
-    puede usar en el correo electrónico y en los grupos de noticias para
-    insertar imágenes o formatear el texto
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="hot-key">
-  <glossterm>Tecla Rápida</glossterm>
-  <glossdef>
-   <para>
-    Teclas rápidas son combinaciones de teclado usadas para realizar
-    acciones en el ordenador en lugar de usar el ratón para la misma
-    acción. Las teclas rápidas pueden acelerar el uso del ordenador.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="ical">
-  <glossterm>iCal</glossterm>
-  <glossdef>
-   <para>
-    <application>iCal</application> es el programa que usa
-    <application>Evolution</application> para manejar la sección del
-    calendario.
-   </para>
-  </glossdef>
- </glossentry> 
-
- <glossentry id="imap">
-  <glossterm>IMAP</glossterm>
-  <glossdef>
-   <para>
-    Dependiendo a quien pregunte, IMAP significa Protocolo de Acceso al
-    Correo de Internet, o Protocolo de Acceso a Correo Interinamente.
-    Lo que sea que signifique, permite acceder al correo que está
-    típicamente (aunque no siempre) guardado remotamente en el servidor en
-    lugar de en el disco duro local.  Algunas veces contrasta con
-    <glossterm>POP</glossterm>.
-    Esto no estará en la prueba.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="inline">
-  <glossterm>En línea</glossterm>
-  <glossdef>
-   <para>
-     Mostrados como para de una mensaje u otro documento, en lugar de
-     incluido como un archivo separado. Contrasta con <glossterm
-     linkend="attachment">Adjunto</glossterm>.
-   </para>
-  </glossdef>
- </glossentry>
- 
-  <glossentry id="ldap">
-   <glossterm>LDAP</glossterm>
-   <glossdef>
-    <para>
-     LDAP, el Protocolo Ligero de Acceso a Directorio, permite a un cliente
-     buscar en una gran base de datos de direcciones, números de teléfono y
-     y personas que se encuentra en un servidor.
-    </para>
-   </glossdef>
-  </glossentry>
-
- <glossentry id="mail-client">
-  <glossterm>Cliente de Correo</glossterm>
-  <glossdef>
-   <para>
-    Un cliente de correo es la aplicación con la que una persona lee y
-    envía correos electrónicos.  En el otro lado están los distintos tipos
-    de servidores de correo, que se encargan de autentificar al usuario
-    y dirigir los mensajes desde el remitente hasta el destinatario.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="minicard">
-  <glossterm>Minitarjeta</glossterm>
-  <glossdef>
-   <para>
-      Un formato para mostrar la información de contacto.  Similar en
-      apariencia a una pequeña tarjeta de visita.
-   </para>
-  </glossdef>
- </glossentry> 
-
- <glossentry id="nautilus">
-  <glossterm>Nautilus</glossterm>
-  <glossdef>
-   <para>
-    <application>Nautilus</application> es la próxima generación del
-    gestor de archivos de <acronym>GNOME</acronym> que está desarrollando
-    la compañía Eazel.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="nickname">
-  <glossterm>Apodo</glossterm>
-  <glossdef>
-   <para>
-    Un alias para una dirección de correo electrónico.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="pop">
-  <glossterm>POP</glossterm>
-  <glossdef>
-   <para>
-     POP, el Protocolo de Oficina de Correos, es un mecanismo para el
-     transporte de correo.  En contraste con IMAP, solo se usa para obtener
-     el correo del servidor y almacenarlo localmente en el disco duro.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="protocol">
-  <glossterm>Protocolo</glossterm>
-  <glossdef>
-   <para>
-     Un método de comunicación acordado, especialmente uno acordado para
-     enviar tipos particulares de información entre ordenadores
-     Ejemplos son POP (Protocolo de Oficina de Correo), para el correo, y
-     HTTP (Protocolo de Transferencia de Hipertexto), para páginas web.
-
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="regular-expression">
-  <glossterm>Expresión Regular</glossterm>
-  <glossdef>
-   <para>
-      Una expresión regular, o "regex", es una forma de describir una
-      cadena de texto usando meta caracteres o símbolos wild-card.  Por
-      ejemplo, la frase <userinput>tener.*pat[a|o]</userinput> significa
-      "cualquier frase que comience por 'tener' y que acabe en 'pata' o
-      'pato'".  Si usted busca esta expresión, encontrará entre otras
-      "tener mala pata" y "tener un pato".  No hay sitio aquí para
-      entrar en profundidad, pero si lo desea, puede echar un vistazo a la
-      documentación del comando <command>grep</command>.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="script">
-  <glossterm>Script</glossterm>
-  <glossdef>
-   <para>
-    Un programa escrito en un lenguaje interpretado (en lugar de
-    compilado).  A menudo usado como sinónimo de "macro," para denotar
-    una serie de comando o acciones pre grabados en una aplicación.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="sendmail">
-  <glossterm>Sendmail</glossterm>
-  <glossdef>
-   <para>
-      Como su nombre indica, <application>sendmail</application> es un
-      programa que envía correo.  <application>Evolution</application>
-      puede usarlo en lugar de <glossterm>SMTP</glossterm>; algunas
-       personas lo prefieren porque permite más flexibilidad, pero es más
-      difícil de configurar.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="shortcut-bar">
-  <glossterm>Barra de Atajos</glossterm>
-  <glossdef>
-   <para>
-     Una parte de <application>Evolution</application> que ofrece
-     a los usuarios un rápido acceso a la partes de la aplicación
-     usadas más frecuentemente.
-   </para>
-  </glossdef>
- </glossentry>
-
-  <glossentry id="signature">
-   <glossterm>Firma</glossterm>
-   <glossdef>
-    <para>
-     En términos de un correo electrónico, una firma es un texto situado
-     al final de todos los mensajes que usted mande, como una firma hecha
-     a mano al final de una carta escrita.  Una firma puede ser cualquier
-     cosa desde su cita preferida hasta un enlace a una página web.  La
-     cortesía dicta que debe tener una longitud inferior a cuatro líneas.
-    </para>
-   </glossdef>
-  </glossentry> 
-
-  <glossentry id="SMTP">
-   <glossterm>SMTP</glossterm>
-   <glossdef>
-    <para>
-      Esta es la manera más común de transportar mensajes desde el
-      ordenador cliente (el suyo) al servidor. SMTP significa Protocolo
-      Simple de Transferencia de Correo.
-    </para>
-   </glossdef>
-  </glossentry> 
-
- <glossentry id="spam">
-  <glossterm>Spam</glossterm>
-  <glossdef>
-   <para>
-    Correo no deseado ó inútil.  El spam normalmente aparece como cartas
-    encadenadas y publicidad de compañías sin escrúpulos o sin sentido.
-    Los mensajes que no valen para nada se conocen como "boletínes
-    opt-in"
-.   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="tooltip">
-  <glossterm>Mensaje de Ayuda</glossterm>
-  <glossdef>
-   <para>
-      Una paqueña caja con texto explicatorio que aparece cuando el puntero
-      del ratón permanece sin moverse sobre un botón o cualquier otro
-      elemento de la interfaz.
-   </para>
-  </glossdef>
- </glossentry>
-
-
-
-
- <glossentry id="virus">
-  <glossterm>Virus</glossterm>
-  <glossdef>
-   <para>
-    Un programa malicioso que se inserta a si mismo en otros para así ser 
-    ejecutado, permitiéndole expandirse a más programas y a otros ordenadores.
-    Un virus puede causar daños sustanciales colapsando redes y unidades de disco, 
-    borrando archivos, o abriendo agujeros de seguridad.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="vcard">
-  <glossterm>vCard</glossterm>
-  <glossdef>
-   <para>
-    Un formato de archivo para el intercambio de información de contactos.
-    Cuando recibe una tarjeta adjunta a un correo, esta probablemente en el
-    formato vCard.  No confundir con <glossterm
-    linkend="vfolder">vFolder</glossterm>.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="vfolder">
-  <glossterm>vFolder</glossterm>
-  <glossdef>
-   <para>
-    Una herramienta para organizar mensajes. vFolders le permite crear una
-    carpeta que contiene los resultados de una búsqueda compleja.  Los
-    contenidos de la carpeta se actualizan dinámicamente.
-   </para>
-  </glossdef>
- </glossentry>
-
-</glossary>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/help/es/config-prefs.sgml b/help/es/config-prefs.sgml
deleted file mode 100644
index ba159f51d5..0000000000
--- a/help/es/config-prefs.sgml
+++ /dev/null
@@ -1,646 +0,0 @@
-<!-- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"> -->
-<chapter id="config-prefs">
-
-      <title>Configuración Avanzada</title>
-      <para>
-        Quizá su servidor de correo ha cambiado de nombre.  Quizá se ha
-        cansado de cierto aspecto de la configuración de sus citas.
-        Cualquiera que sea la razón, usted quiere cambiar su configuración
-        de <application>Evolution</application>.  Este capítulo le
-        dirá como hacer exactamente eso.
-      </para>
-
-       <sect1 id="config-prefs-mail">
-         <title>Configuración del Correo</title>
-        <para>
-        Para cambiar su configuración de correo, seleccione <menuchoice>
-        <guimenu>Configuración</guimenu> <guimenuitem>Configuración
-        de correo</guimenuitem></menuchoice> estando en Inbox.  Esto
-        abrirá la <interface>ventana de preferencias del correo</interface>,
-        ilustrada en <xref linkend="config-prefs-mail-fig">.  Las
-        preferencias de correo están separadas en varias categorías:
-        <variablelist>
-	<varlistentry>
-          <term><guilabel>Identidades</guilabel></term>
-          <listitem>
-	    <para>
-               Esto le permite crear o alterar una o más identidades para
-               su correo electrónico.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Fuentes</guilabel></term>
-	  <listitem>
-	    <para>
-               Esta pestaña le permite indicar a
-               <application>Evolution</application> de donde obtener el
-               correo que le envíen y como obtenerlo.
-            </para>
-          </listitem>
-	</varlistentry>
-	<varlistentry>
-
-	  <term><guilabel>Transporte de Correo</guilabel></term>
-	  <listitem>
-	    <para>
-               Esta pestaña le permite indicar a
-               <application>Evolution</application> como enviar su correo.
-            </para>
-          </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><guilabel>Servidores de Noticias</guilabel></term>
-	  <listitem>
-	    <para>
-              Si quisiera usar <application>Evolution</application> para
-              leer los grupos de noticias, puede especificar aquí las
-              características de su servidor de noticias..
-           </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><guilabel>Otros</guilabel></term>
-	  <listitem>
-	    <para>
-              Configuración miscelánea para el correo y las noticias, como
-              el uso de HTML, y cuanto tiempo debe esperar
-              <application>Evolution</application> antes de marcar un
-              mensaje como leído.
-           </para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-
-    </para>
-
-      <!-- ==============Figure===================== -->
-      <figure id="config-prefs-mail-fig">
-	<title>Dialogo de Preferencias del Correo</title>
-	<screenshot>
-	  <screeninfo>Setting mail preferences</screeninfo>
-	  <graphic fileref="fig/config-mail" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	</screenshot>
-      </figure>
-      <!-- ==============End of Figure================-->
-
-
-      <sect2 id="config-prefs-mail-identity">
-      <title>Configuración de Identidades</title> 
-      <para>
-         Si solo tiene una cuenta de correo, o envía el correo desde una
-         sola dirección, tan solo deberá configurar una identidad. De todos
-         modos, si quiere puede tener múltiples identidades.  Esto puede
-         resultar útil si quiere mantener separados su correo personal y
-         profesional, o si tiene varios puestos en su trabajo.
-         
-       </para>
-       <para>
-         Para añadir una nueva identidad, simplemente pulse
-         <guibutton>Añadir</guibutton>. Para modificar una identidad
-         ya existente, seleccione la de la pestaña
-         <guilabel>Identidad</guilabel> de la ventana de
-         <interface>Preferencias</interface>, y pulse
-         <guibutton>Editar</guibutton>.
-      </para>
-
-      <para>
-         <application>Evolution</application> le presentará una caja de
-         dialogo que contiene cuatro campos:
-          <itemizedlist>
-           <listitem>
-	    <para>
-              <guilabel>Nombre Completo:</guilabel> por defecto, este es el
-              mismo nombre que el nombre completo descrito en su cuenta de
-              usuario en su ordenador.  Puede seleccionar otro si lo desea.
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Dirección de Correo:</guilabel> Escriba su dirección
-              de correo en este espacio.
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Organización:</guilabel> Si envía mensajes en
-              representación de una compañía u otra organización,
-              escriba aquí el nombre de la misma.
-            </para>
-	  </listitem>
-           <listitem>
-	    <para>
-              <guilabel>Archivo de Firma:</guilabel> Puede elegir un
-              pequeño archivo de texto para que sea añadido a todos los
-              mensajes que mande.  Típicamente, los archivos de firma
-              incluyen la dirección u otra información de contacto, o su
-              cita preferida.  Es una buena costumbre hacer que no tenga
-              más de cuatro líneas.
-            </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-    </sect2>
-
-    <sect2 id="config-prefs-mail-network">
-      <title>Configuración de la Red</title> 
-      <para>
-        Para enviar correo con
-        <application>Evolution</application>, deberá conectarse a la red.
-        Para hacer esto deberá conocer su nombre de usuario y su clave, que
-        tipo de protocolos de recepción y envío usa su red, y los nombres
-        de los servidores que va a usar.  Si está migrando desde otro
-        programa de trabajo en grupo o de correo, casi con toda seguridad
-        podrá usar la misma configuración que en dicho programa. La
-        configuración relacionada con la Red se encuentra en las pestañas
-        <guilabel>Fuentes de Correo</guilabel> y
-        <guilabel>Transportes de Correo</guilabel>.
-      </para>
- 
-      <sect3 id="config-prefs-network-sources">
-	<title>Fuentes del Correo</title>
-	<para>
-          La pestaña <interface>Fuentes de Correo</interface> le permite
-          editar, añadir, o borrar métodos de obtener el correo de los
-          servidores.  Pulsando en <guibutton>Añadir</guibutton> o
-          <guibutton>Editar</guibutton> aparecerá una caja de diálogo que
-          le ofrecerá las siguientes opciones:
-           <variablelist>
-	    <varlistentry>
-	      <term><guilabel>Tipo de Fuente de Correo:</guilabel></term>
-	      <listitem>
-		<para>
-                  Seleccione entre servidores <glossterm
-                  linkend="imap">IMAP</glossterm> o <glossterm
-                  linkend="pop">POP</glossterm>, o archivos tipo
-                  <systemitem><filename>mbox</filename></systemitem>
-                  o <systemitem><filename>mh</filename></systemitem>
-                  al estilo Unix.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term> <guilabel>Servidores:</guilabel></term>
-	      <listitem>
-		<para>
-                  Introduzca el nombre del servidor de su fuente de correo
-                  en este campo. Si usa  puede o no que sea el mismo que su
-                  servidor <glossterm linkend="smtp">SMTP</glossterm>.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Nombre de usuario:</guilabel></term>
-	      <listitem>
-		<para>
-                  Introduzca el nombre para la cuenta que tiene en el
-                  servidor-- este debería ser la parte de delante de la @
-                  de su dirección de correo.  Si usa archivos
-                  <systemitem><filename>mbox</filename></systemitem>
-                  o <systemitem><filename>mh</filename></systemitem>
-                  como fuentes de correo, no necesita escribir un nombre de
-                  usuario.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Autentificación:</guilabel></term>
-	      <listitem>
-		<para>
-                  Diga a <application>Evolution</application> como
-                  verificar su identidad con el servidor.  Sus opciones
-                  varían dependiendo del tipo de servidor que esté usando,
-                  y de la forma en que esté configurado.  Dado el nombre del
-                  servidor,
-                  <application>Evolution</application> puede detectar que
-                  tipos de autentificación ofrece.
-               </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term><guilabel>Probar Configuración</guilabel></term>
-	      <listitem>
-		<para>
-                  Pulse este botón para que
-                  <application>Evolution</application> compruebe si sus
-                  fuentes de correo están configuradas correctamente.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-          </para>
-          <para>
-            Si tiene varias fuentes de correo, pulsando <guibutton>
-            Obtener</guibutton> actualizará cualquier carpeta IMAP,
-            <systemitem><filename>mh</filename></systemitem>, o
-            <systemitem><filename>mbox</filename></systemitem>
-            y comprobará y descargará el correo de todos los servidores POP.
-            En otras palabras, <guibutton>Obtener</guibutton> obtiene su
-            correo, sin importar cuantas fuentes tenga, o de que tipo sean.
-          </para>
-      </sect3>
-
-      <sect3 id="config-prefs-mail-network-transports">
-	<title>Transportes del Correo</title>
-	<para>
-           La pestaña <interface>Transporte del Correo</interface> le
-           permite especificar como enviará el correo.  Evolution
-           actualmente soporta dos tipos de transporte: <glossterm linkend="smtp">SMTP</glossterm>, el cual usa un
-           servidor de correo remoto, y
-           <glossterm linkend="sendmail">sendmail</glossterm>, el cual usa el
-           programa <application>sendmail</application> de su sistema local.
-           <application>Sendmail</application> es más difícil de configurar,
-           pero ofrece más flexibilidad que
-           <glossterm>SMTP</glossterm>.
-        </para>
-	<para>
-            Para usar <guilabel>SMTP</guilabel>, necesitará introducir
-            el nombre de su servidor SMTP.  Puede que sea el mismo nombre
-            que el del servidor de su fuente de correo.
-         </para>
-         <para>
-            <application>Evolution</application> puede intentar
-            determinar si ha introducido un nombre de servidor válido.  Para
-            que lo haga, pulse el botón <guilabel>Comprobar
-            Configuración</guilabel>.
-         </para>
-	</sect3>
-      </sect2>
-      <sect2 id="config-prefs-network-news">          
-          <title>Servidores de Noticias</title>
-          <para>
-            Los grupos de noticias se parecen tanto a listas de correo que
-            no hay ninguna razón para no tenerlos al lado de su correo.  La
-            primera vez que seleccione la pestaña <guilabel>Servidor de
-            Noticias</guilabel>, verá una caja vacía con tres botones ya
-            familiares a la derecha: <guibutton>Añadir</guibutton>,
-            <guibutton>Editar</guibutton>, y
-            <guibutton>Borrar</guibutton>.
-          </para>
-          <para>
-            Pulse <guibutton>Añadir</guibutton> para añadir un servidor de
-            noticias, será preguntado por su nombre.  Introduzca el nombre,
-            pulse <guibutton>ACEPTAR</guibutton>, y ya está.  Naturalmente, puede
-            tener tantos servidores de noticias como desee.  Los servidores
-            de noticias aparecerán detrás de sus servidores IMAP en la
-            <interface>barra de carpetas</interface>.
-          </para>
-     </sect2>
-
-     <sect2 id="config-prefs-mail-other">
-	<title>Otras Preferencias del Correo</title>
-	<para>
-          No todo encaja bien en categorías.  Esta parte contiene
-          una miscelánea de configuraciones que no tienen demasiado que ver
-          unas con otras.
-          <variablelist>
-
-             <varlistentry>
-                <term> 
-                   <guilabel>Enviar mensajes en formato HMTL</guilabel>
-                </term>
-                <listitem><para>
-                    Si selecciona esta opción, enviará sus
-                    mensajes en HTML por defecto.  Si no la selecciona, sus
-                    mensajes se enviarán sin formato HTML a menos que seleccione 
-                    <menuchoice> <guimenu>Formato</guimenu> <guimenuitem>HTML</guimenuitem>
-                    </menuchoice> en la ventana de composición de mensajes.
-                    Vea <xref linkend="usage-mail-getnsend-send-html">
-                    para más información acerca del correo en HTML.
-                </para></listitem>
-              </varlistentry>
-             <varlistentry>
-                <term> 
-                   <guilabel>Marcar Mensajes como Leídos Pasados</guilabel>
-                </term>
-                <listitem><para> 
-                    Cuando selecciona un mensaje,
-                    <application>Evolution</application> esperará un
-                    momento antes de marcarlo como leído. Puede poner el
-                    tiempo de espera, en milisegundos, aquí.
-                 </para></listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>
-                   <guilabel>Formato de Carpeta</guilabel>
-                </term>
-                <listitem> <para> Por defecto,
-                   <application>Evolution</application> guarda el correo
-                   en el formato
-                   <systemitem><filename>mbox</filename></systemitem>.
-                   Si quiere puede cambiar al formato
-                   <systemitem><filename>mh</filename></systemitem>. Sepa
-                   que esta en una característica avanzada y que puede hacer
-                   que pierda algunos mensajes, así que probablemente
-                   primero debería hacer una copia de seguridad de su
-                   directorio <systemitem><filename>evolution</filename>                   </systemitem>
-. Además, llevará bastante tiempo si tiene
-                   un mailbox grande.
-               </para></listitem>
-             </varlistentry>
-           </variablelist>
-        </para>
-      </sect2>
-    </sect1>
-
-    <sect1 id="config-prefs-cal">
-       <title>Configuración del Calendario</title>
-       <para>
-          Para especificar sus preferencias sobre el calendario, selección
-          <menuchoice><guimenu>Configuraciones</guimenu>
-          <guimenuitem>Configuración del
-          Calendario</guimenuitem></menuchoice> desde la vista del
-          calendario.  Esto abrirá la ventana de
-          <interface>Preferencias</interface>.  Contiene cuatro pestañas:
-          <guilabel>Vista del tiempo</guilabel>,
-          <guilabel>Colores</guilabel>, <guilabel>Lista de Tareas</guilabel>
-          y <guilabel>Alarmas</guilabel>.  La <interface>ventana de
-          preferencias del calendario</interface> está ilustrada en <xref
-          linkend="config-prefs-cal-fig">.
-
-      <!-- ==============Figure===================== -->
-      <figure id="config-prefs-cal-fig">
-	<title>Diálogo de Preferencias del Calendario</title>
-	<screenshot>
-	  <screeninfo>Si esto funcionase en mi trabajo también como en mi calendario...</screeninfo>
-	  <graphic fileref="fig/config-cal" format="png" srccredit="Aaron Weber">
-	    </graphic>
-	</screenshot>
-      </figure>
-      <!-- ==============End of Figure================-->
-        </para>
-
-    <sect2 id="config-prefs-cal-time">
-      <title>Configuración de las Vistas del Tiempo</title>
-      <para>
-        La pestaña <guilabel>mostrar el Tiempo</guilabel> le permite
-        configurar lo siguiente:
-        <variablelist>
-	  <varlistentry>
-	    <term>Formato del tiempo</term>
-	    <listitem>
-	      <para>Puede elegir aquí entre los formatos de doce horas (AM/PM) y
-	      de veinticuatro horas simplemente pulsando sobre el botón apropiado.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>La semana comienza</term>
-	    <listitem>
-	      <para>Puede fijar que las semanas comiencen en Domingos o en               Lunes.</para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Rango diario</term>
-	    <listitem>
-               <para>
-                 ¿Cuando comienza u jornada laboral y cuando termina?
-                 En la vista diaria y semanal,
-                 <application>Evolution</application> muestra todas las
-                 horas del rango que seleccione aquí, incluso si no hay
-                 citas a esas horas.  Naturalmente, podrá poner una cita
-                 fuera de estas horas, y si lo hace, la vista se extenderá
-                 para mostrarla.
-               </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-    <sect2 id="config-prefs-cal-color">
-      <title>Colores del Calendario</title>
-      <para>
-        La pestaña de <interface>colores</interface> le permite decidir
-        de que color será su calendario.  La pestaña consiste en un
-        calendario de ejemplo a la derecha y de una lista de diez elementos
-        que pueden ser coloreados en diferentes formas.  Si pulsa en botón
-        de color a la derecha de cada elemento, mostrará una ventana de
-        selección de color donde podrá elegir a que color cambiar el
-        elemento.  Pulsando <guibutton>ACEPTAR</guibutton> en el diálogo de
-        selección de colores, puede ver os resultados de los colores en el
-        calendario de ejemplo.
-     </para>
-     <para>Los elementos a mostrar cuyos colores puede fijar son:
-
-          <itemizedlist>
-           <listitem>
-              <para>
-                <guilabel>Marco:</guilabel> Las líneas entre los días y la
-                parte de arriba de la vista.
-              </para>
-            </listitem>
-
-           <listitem>
-              <para> <guilabel>Títulos:</guilabel> Color del texto para los
-                nombres de los días y los meses y para otros títulos.
-              </para>
-            </listitem>
-
-           <listitem>
-              <para> <guilabel>Días vacíos:</guilabel> Este es el color de
-                fondo para cualquier espacio de tiempo en el que no tiene citas.
-               </para>
-            </listitem>  
-
-         <listitem>
-              <para>         
-             <guilabel>Citas:</guilabel> Este es el color de fondo para
-                cualquier espacio de tiempo en el que tenga citas.
-               </para>
-            </listitem>
-     
-	  <listitem>
-	    <para> <guilabel>Día resaltado:</guilabel> El color de fondo
-              para un espacio de tiempo seleccionado.
-             </para>
-	  </listitem>
-
-          
-	  <listitem>
-	    <para>         
-              <guilabel>Números de los días:</guilabel> Color del texto para los números de las fechas.
-            </para>
-	  </listitem>
-
-              
-	  <listitem>
-	    <para>
-              <guilabel>Número del día actual:</guilabel> Color del texto para la fecha del día de hoy.
-             </para>
-	  </listitem>
-
-	  <listitem>
-	    <para> <guilabel>Elementos Por Hacer que dentro de plazo:
-             </guilabel> Color del texto para los elementos de la lista Por
-             Hacer que están aún dentro del plazo.
-             (¿Quizá sea el color de fondo? ¡averígualo!)
-               </para>
-	  </listitem>
-
-
-	  <listitem>
-	    <para> <guilabel>Elementos Por Hacer de plazo hoy:</guilabel>
-             Color del texto para las tareas de hoy.
-               </para>
-	  </listitem>
-
-	  <listitem>
-	    <para> <guilabel>Elementos Por Hacer fuera de plazo:</guilabel>
-             Color del texto para las tareas fuera de plazo.
-               </para>
-	  </listitem>
-
-          </itemizedlist>
-        </para>
-    </sect2>
-
-    <sect2 id="config-prefs-cal-todo">
-      <title>Configuración de la Lista de Tareas Por-Hacer</title>
-     <para>
-       Puede elegir que información muestra la lista Por Hacer y la manera
-       como la muestra.  Las dos áreas de la pestaña <interface>Lista Por
-       Hacer</interface> ofrecen varias opciones cada una:
-       <variablelist>
-	 <varlistentry>
-	   <term>Mostrar en la Lista Por Hacer</term>
-	    <listitem>
-	      <para>
-                Esta opción contiene tres elementos.  Si marca las casillas
-                a su lado, esa información aparecerá en la lista Por Hacer
-                para cada tarea que contenga:
-                <itemizedlist>
-                  <listitem>
-		    <para><guilabel>Fecha de Plazo</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Tiempo hasta el Plazo</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Prioridad</guilabel></para>
-                   </listitem>
-               </itemizedlist>
-               </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Opciones de Estilo</term>
-	    <listitem>
-               <para>
-                 Seleccione entre las siguientes casillas para determinar
-                 que aspecto tendrá la lista Por Hacer:
-                <itemizedlist>
-                  <listitem>
-		   <para><guilabel>Resaltar elementos fuera de plazo</guilabel></para>
-                   </listitem>
-                  <listitem>
-		   <para><guilabel>Resaltar elementos de plazo hoy</guilabel></para>
-                   </listitem>
-                  <listitem>
-		   <para><guilabel>Resaltar elementos dentro del plazo</guilabel></para>
-                   </listitem>
-               </itemizedlist>                 
-               </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="config-prefs-cal-alarms">
-      <title>Colocación de Alarmas</title>
-      <para>  
-        La pestaña de <interface>alarmas</interface> le da la posibilidad de elegir entre tres opciones:
-        <itemizedlist>
-	  <listitem>
-	    <para><guilabel>Pitar al mostrar las alarmas</guilabel>: seleccione
-	    esta opción para que <application>Evolution</application> emita un
-	    pitido para la alarma que haya fijado.  Si deja esta opción sin
-	    marcar, <application>Evolution</application> tan solo le alertará de
-	    los sucesos abriendo un ventana de diálogo. Estos pitidos son
-	    distintos a los de las alarmas auditivas.
-           </para>
-	  </listitem>
-	  <listitem>
-	    <para><guilabel>Las alarmas auditivas cesan tras: </guilabel>
-	    Seleccione esta opción para que las alarmas auditivas cesen
-	    automáticamente pasados un número determinado de segundos.  </para>
-	  </listitem>
-	  <listitem>
-	    <para><guilabel>Activar recordatorio para:</guilabel> Si quiere
-	    tener la posibilidad de decirle a
-	    <application>Evolution</application> que repita la alarma en unos
-	    minutos, elija esta opción y decida cuanto tiempo quiere que espere
-	    antes de repetirla.
-           </para>
-	  </listitem>
-	</itemizedlist>   
-      </para>
-    </sect2>
-
-   </sect1>
-
-   <sect1 id="config-prefs-contact">
-      <title>Administrando el Administrador de Contactos</title>
-	<para>
-          Para fijar el comportamiento de su Administrador de Contactos,
-          pulse en la pestaña
-          <guibutton>Administrador de Contactos</guibutton> en la ventana de
-          <interface>Preferencias</interface>.
-        </para>
-	<para>
-          Ha definido las siguientes opciones: <!--insertar aquí una lista
-          de variables-->
-        </para>
-      
-        <sect2 id="config-prefs-contact-ldap-add">
-           <title>Añadiendo Servidores de Directorio</title>
-           <para>
-              Para añadir un nuevo servidor LDAP a su carpeta de contactos
-              disponibles, selección <menuchoice><guimenu>Acciones</guimenu>
-              <guimenuitem>Nuevo Servidor de Directorio</guimenuitem>
-              </menuchoice>.  Esto mostrará una pequeña caja de diálogo que
-              le permitirá introducir los siguientes datos:
-              <itemizedlist>
-	         <listitem><para>
-                    <guilabel>Nombre</guilabel> &mdash; cualquier nombre que elija para el servidor.
-                 </para></listitem>
-
-                <listitem><para>
-                    <guilabel>Descripción</guilabel> &mdash; un descripción larga del servidor.
-                 </para></listitem>
-
-                    <listitem><para>
-                    <guilabel>Servidor LDAP</guilabel> &mdash; la dirección de red del servidor.
-                 </para></listitem> 
-               
-                   <listitem><para>
-                    <guilabel>Puerto</guilabel> &mdash; por defecto, el puerto es el 389.
-                 </para></listitem>
-
-                   <listitem><para>
-                    <guilabel>DN Raíz</guilabel> &mdash; entre el DN raíz aquí.
-                 </para></listitem>
-             </itemizedlist>
-         </para>
-       </sect2>
-      </sect1>
-    
-
-
-  <sect1 id="config-prefs-general">
-    <title>Preferencias Generales</title> 
-    <para>
-          Las opciones adicionales de configuración se cubrirán aquí,
-          según vayan estando disponibles.
-        </para>
-  </sect1>
-</chapter>
-    
-
-
-
-
-
diff --git a/help/es/config-setupassist.sgml b/help/es/config-setupassist.sgml
deleted file mode 100644
index f557b6e02a..0000000000
--- a/help/es/config-setupassist.sgml
+++ /dev/null
@@ -1,211 +0,0 @@
-    <chapter id="config-setupassist">
-      <title>Configuración Fácil con el Asistente</title>
-      <para>
-        La primera vez que intente usar el correo, el asistente de
-        configuración del correo le pedirá algunos datos básicos, para que
-        <application>Evolution</application> le deje usar el correo. Si
-        prefiere una configuración más detallada, o si quiere realizar
-        cambios en una configuración ya existente, vea <xref
-        linkend="config-prefs">.
-      </para>
-
-   <sect1 id="config-setupassist-mail">
-      <title>Configuración del Correo</title>
-      <para>
-        La primera vez que intente enviar o recibir correo con
-	<application>Evolution</application>, aparecerá el <interface>asistente de
-	configuración del correo</interface> para ayudarle con la configuración de
-	su correo.  Si no piensa usar el correo electrónico, o si prefiere
-	ocuparse de la configuración de su correo más tarde, pulse
-	<guibutton>Cancelar</guibutton>.
-      </para>
-
-<!--  
-
-        Antes de obtenerlo, eso si, debe decidir donde lo quiere conservar.
-	Sus opciones variarán ligeramente dependiendo de la configuración de su
-	red, pero quedan simplificadas a guardar su correo en su disco duro
-	(usando <glossterm linkend="pop">POP</glossterm>), o guardarlo en
-	la red (usando <glossterm linkend="imap">IMAP</glossterm>).
-	Si guarda el correo en su disco duro local, podrá leerlo tanto si
-	está conectado o como si no, pero tan solo podrá leerlo desde un
-	ordenador.  Si lo guarda en la red, solo podrá leerlo cuando esté
-	conectado, pero podrá leerlo desde casi cualquier ordenador con conexión
-	a la red, incluso si no tiene
-	<application>Evolution</application>.
-
-
-        Si elige POP, pondrá el correo en el
-        <guilabel>Inbox</guilabel> en la carpeta <guilabel>Local</guilabel>.
-        Si elige IMAP, es el
-        <guilabel>Inbox</guilabel> de una carpeta con el mismo nombre que su
-        servidor de correo.  Esto es así para que pueda tener varios
-        servidores IMAP distintos si quiere.  Vea <xref
-        linkend="config-prefs-mail"> para más información acerca de los
-        servidores de correo.
--->
-
-      <para>
-         El asistente para la configuración (algunas veces llamado 
-	 <glossterm>Druida</glossterm>, por analogía con los "Magos"
-	 que usan otros programas) le guiará a través del proceso de configuración
-	 de la red.  Le preguntará acerca de alguna información básica. Su
-	 administrador de sistemas o su proveedor de Internet debería tener
-	 las respuestas que necesitará.  El asistente para la configuración del
-	 correo está representado en <xref linkend="usage-setup-fig">.
-
-<!-- ==============Figure=================================== -->
-<!-- druid-pic should eventually become assistant-pic -->
-
-	<figure id="usage-setup-fig">
-	<title>Asistente para la Configuración del Correo</title>
-	<screenshot>
-	  <screeninfo>Ventana del Correo de Evolution</screeninfo>
-	  <graphic fileref="fig/mail-druid-pic" format="png" srccredit="Kevin Breit">
-	    </graphic>
-	</screenshot>
-	</figure>
-<!-- ==============End of Figure=================================== -->
-
-
-
-  El asistente le pedirá la siguiente información:
-        <variablelist>
-
-          <varlistentry>
-               <term> <guilabel>Nombre:</guilabel> </term> <listitem>
-	  <para>Su nombre completo. </para></listitem>
-         </varlistentry>
-
-       <varlistentry>
-          <term><guilabel>Dirección de correo electrónico:</guilabel></term>
-	  <listitem><para>
-                 Su dirección de correo completa.
-                 </para></listitem>
-       </varlistentry>
-
-       <varlistentry>
-          <term> <guilabel>Organización:</guilabel></term>
-	  <listitem>
-	    <para>
-           Cualquier organización a la que represente, o la compañía para
-           la que trabaja.  Deje esto en blanco si lo prefiere, o ponga
-           "Yo mismo" así la gente sabrá que sus opiniones son solo suyas.
-           </para>
-	  </listitem>
-      </varlistentry>
-
-      <varlistentry>
-	 <term><guilabel>Archivo de Firma:</guilabel></term>
-          <listitem>
-            <para>
-             Un archivo de texto añadido a cualquier mensaje que envíe. Una
-             firma típica consiste en su nombre y su dirección de correo,
-             o una cita que le guste.  Es una buena medida mantener su
-             "firma" corta: cuatro líneas son suficientes. Recuerde,
-             que esto se adjuntará a todos los mensajes que envíe.
-            </para>
-         </listitem>
-       </varlistentry>
-
-       <varlistentry>
-           <term> <guilabel>Tipo de fuente del correo:</guilabel></term>
-	  <listitem>
-	    <para>
-              <application>Evolution</application> soporta varias fuentes
-              para el correo: servidores <glossterm 
-              linkend="pop">POP</glossterm> e <glossterm 
-              linkend="imap">IMAP</glossterm>, y archivos 
-              <systemitem><filename>mbox</filename></systemitem> y
-              <systemitem><filename>mh</filename></systemitem> al estilo UNIX.
-              Los servidores POP le permiten obtener su correo y guardarlo
-              localmente para que pueda consultarlo incluso cuando no esté
-              conectado a la red; los servidores <glossterm>IMAP</glossterm>
-              guardan el correo en el servidor para que puede acceder a el
-              desde varios sitios; los
-              archivos <systemitem><filename>mbox</filename></systemitem>
-              son usados por su ordenador para el correo interno, y pueden
-              ser útiles si quiere cambiar desde otro cliente de correo como
-              <application>Spruce</application> o
-              <application>Netscape Communicator</application>.  Pregunte
-              a su administrador de sistemas cual debe usar, o intente
-              hasta que alguno funcione.  Puede usar múltiples fuentes si lo
-              desea; vea <xref
-              linkend="config-prefs-mail-network"> para más
-              información.
-            </para>
-            <para>
-              Si decide que <application>Evolution</application>
-              no use ningún servidor, los siguientes elementos no son
-              relevantes; tan solo debe indicar donde se encuentran los
-              archivos a los que desea acceder.
-            </para>
-	  </listitem>
-	  </varlistentry>
-          
-       <varlistentry>
-          <term> <guilabel>Servidor:</guilabel></term>
-	  <listitem>
-	    <para>
-              Este debe ser el nombre del servidor de donde obtiene el
-              correo entrante.  Puede (o puede no) ser el mismo servidor
-              al que envía su correo saliente.
-            </para>
-	  </listitem>
-	</varlistentry>
-
-     <varlistentry>
-	  <term><guilabel>Nombre de usuario:</guilabel></term>
-	<listitem>
-            <para>
-             Introduzca el nombre de usuario de la cuenta de su servidor de
-             correo, si tiene una. En casi todos los casos, esta es la parte
-             de su correo de antes del carácter @, y
-             <application>Evolution</application> elige ese valor como
-             valor por defecto.  Si tiene un nombre de usuario distinto,
-             puede escribirlo aquí.
-           </para>
-	  </listitem>
-      </varlistentry>
-     
-       <varlistentry>
-            <term><guilabel>Autentificación:</guilabel></term> 
-	    <listitem>
-	    <para>
-              Selección el tipo de autentificación que usará.  Puede              pulsar <guibutton>Detectar tipos soportados</guibutton> para
-              averiguar que protocolos de autentificación admite su sistema.
-            </para>
-	  </listitem>
-       </varlistentry>
-
-      <varlistentry> 
-         <term><guilabel>Transporte de Correo:</guilabel></term>
-	  <listitem>
-	    <para>
-              Este es el protocolo de envío de correo que quiera usar.
-              <application>Evolution</application> soporta ambos
-              <glossterm linkend="smtp">SMTP</glossterm> y
-              <application>sendmail</application>; SMTP es de lejos el más
-              común.
-            </para>
-	  </listitem>
-      </varlistentry>
-     </variablelist>
-      </para>
-      <para>
-        Para aprender a configurar <application>Evolution</application>
-        con todo detalle, o para cambiar las preferencias una vez que las
-        ha fijado, mire <xref linkend="config-prefs">.
-      </para>
-    </sect1>
-
-</chapter>
-
-
-
-
-
-
-
-
-
diff --git a/help/es/config-sync.sgml b/help/es/config-sync.sgml
deleted file mode 100644
index aeec2fba92..0000000000
--- a/help/es/config-sync.sgml
+++ /dev/null
@@ -1,122 +0,0 @@
-  <chapter id="config-sync">
-     <title>Configurando su sistema de sincronización</title> 
-     <para>
-        La sincronización le presenta dos temas de los que se tendrá que
-        ocupar. 
-        <simplelist>
-          <member>
-            Su ordenador deberá reconocer y acceder a su dispositivo de
-            mano. En este momento, <application>Evolution</application> solo
-            soporta dispositivos con Palm-OS como el PalmPilot y el
-            Handspring Visor.
-          </member>
-          <member>
-           Debe decidir que estilo de sincronización quiere.
-          </member>
-        </simplelist>
-
-    </para>
-    <para>
-       Si no ha usado antes un dispositivo de mano con su ordenador, debe
-       ejecutar el <application>Centro de Control</application> de GNOME
-       y asegurarse que <application>Enlaze con Pilot</application> está
-       configurado apropiadamente. Entonces, seleccione el <glossterm
-       linkend="conduit">enlaze</glossterm> de
-       <application>Evolution</application> bajo la sección
-       <guilabel>Enlazes de Pilot</guilabel> del Centro de Control.
-      </para>
-     <para>
-        Una vez que su ordenador y su dispositivo con Palm-OS se hablan el
-        uno al otro, debe decidir que quiere que hagan exactamente con los
-        datos que se intercambian.  Sus opciones pueden variar dependiendo
-        del enlaze, pero tipicamente serán:
-
-        <variablelist>
-         <varlistentry>
-            <term>Desactivar </term>
-            <listitem> 
-               <para>
-                  No hace nada.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Sincronizar</term>
-            <listitem> 
-               <para>
-                  Copia los datos nuevos del ordenador al dispositivo de
-                  mano, y del dispositivo de mano al ordenador.  Elimina
-                  elementos que estaban en ambos sistemas pero han sido
-                  borrados en uno de ellos.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Copiar desde Pilot</term>
-            <listitem> 
-               <para>
-                  Si hay datos nuevos en el dispositivo de mano, los copia
-                  al ordenador.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Copiar a Pilot</term>
-            <listitem> 
-               <para>
-                 Copia datos nuevos del ordenador al dispositivo de mano. 
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Sincronizar desde Pilot</term>
-            <listitem> 
-               <para>
-                  Copia los datos nuevos del dispositivo de mano al
-                  ordenador, y elimina cualquier información del ordenador
-                  que haya sido borrada del dispositivo de mano.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Sincronizar en el Pilot</term>
-            <listitem> 
-               <para>
-                  Copia los datos nuevos del ordenador al dispositivo de
-                  mano, y elimina cualquier información del dispositivo
-                  de mano que haya sido borrada del ordenador.
-               </para>
-            </listitem>
-          </varlistentry>
-       </variablelist>
-    </para>
-
-    <para>
-      Seleccione un comportamiento para cada enlaze disponible.  Para la
-      mayoría, querra quedarse con <guilabel>Sincronizar</guilabel>.
-      Entoces, ponga el dispositivo de mano en su cuna y presione el
-      botón de sincronización.
-    </para>
-
-
-      <para> 
-         <warning> 
-	  <title>Prevención de Pérdida de Datos</title> 
-	  <para>
-	    Siempre es una buena idea hacer una copia de seguridad.  Para hacerla,
-	    haga una copia de su directorio
-	    <systemitem><filename>~/evolution</filename></systemitem>.
-          </para>
-	</warning>
-       </para>
-
-    </chapter>
-
-
-
-
diff --git a/help/es/evolution-es.omf b/help/es/evolution-es.omf
deleted file mode 100644
index f96339de9c..0000000000
--- a/help/es/evolution-es.omf
+++ /dev/null
@@ -1,16 +0,0 @@
-?xml version="1.0" standalone="no"?>
-<omf>
-  <resource>
-   <creator>
-     Ximian, Inc.
-   </creator>
-    <title>
-      Manual para Usuarios de Ximian Evolution
-    </title>
-    <date>2002</date>
-    <subject category="GNOME|Aplicaciones"/>
-    <format mime="text/html"/>
-    <identifier url="index.html"/>
-    <language code="C"/>
-  </resource>
-</omf>
diff --git a/help/es/evolution.sgml b/help/es/evolution.sgml
deleted file mode 100644
index d9bee1a50f..0000000000
--- a/help/es/evolution.sgml
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[
-
-<!ENTITY PREFACE SYSTEM "preface.sgml">
-<!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.sgml">
-<!ENTITY USAGE-EXEC-SUMMARY SYSTEM "usage-exec-summary.sgml">
-<!ENTITY USAGE-MAIL SYSTEM "usage-mail.sgml">
-<!ENTITY USAGE-CONTACT SYSTEM "usage-contact.sgml">
-<!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.sgml">
-<!ENTITY USAGE-SYNC SYSTEM "usage-sync.sgml">
-<!ENTITY USAGE-PRINT SYSTEM "usage-print.sgml">
-<!ENTITY CONFIG-SETUPASSIST SYSTEM "config-setupassist.sgml">
-<!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
-<!ENTITY CONFIG-SYNC SYSTEM "config-sync.sgml">
-<!ENTITY MENUREF SYSTEM "menuref.sgml">
-<!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml">
-<!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml">
-<!ENTITY APX-AUTHORS SYSTEM "apx-authors.sgml">
-
-]>
-
-
-<!-- Almost every chapter is an entity.  Files, Chapter id's, and
-entity names correspond.  APX is for appendix. Note that there is no
-entity for apx-notes.sgml, which is still included in the file
-set. Reinstate the entity if and when the Notes feature is
-implemented. -->
-
-<book id="index">
-  <bookinfo>
-    <title>Una guía para el usuario de Evolution</title>
-    <authorgroup>
-      <author><firstname>Aaron</firstname><surname>Weber</surname></author>
-      <author><firstname>Kevin</firstname><surname>Breit</surname></author>
-    </authorgroup>
-    <copyright>
-      <year>2000</year>
-      <holder> Ximian, Inc., </holder>
-      <holder> Kevin Breit </holder>
-    </copyright>
-    
-    <legalnotice id="legalnotice">
- 
-     <para>
-         Se garantiza permiso para copiar, distribuir y/o modificar este
-         documento bajo los términos de la <ulink type="help"
-         url="ghelp:fdl"><citetitle>Licencia de Documentación Libre
-         de GNU</citetitle></ulink>, Versión 1.1 o posteriores versiones
-         publicadas por la Fundación para el Software Libre (Free Software
-         Foundation) sin Secciones Invariantes, sin Textos de Portada y sin
-         Textos de Contraportada. Puede obtener una copia de la
-         <citetitle>Licencia de Documentación Libre de GNU</citetitle>n         de la Fundación para el Software Libre visitando su
-         <ulink type="http" url="http://www.fsf.org">sitio Web</ulink>
-         o escribiendo a: Free Software Foundation,
-         Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-         USA.
-       </para>
-       <para>
-         Muchos de los nombres que usan las compañías para distinguir sus
-         productos y servicios están registrados como marcas.  Cuando
-         aparecen esos nombres en la documentación de GNOME, y el Proyecto
-         de Documentación de GNOME tiene conocimiento de dichas marcas,
-         estos han sido escritos en mayúsculas o empiezan con mayúsculas.
-       </para>
-    </legalnotice>
-
-   <releaseinfo>
-      This is version 0.9 of the Evolution manual.
-   </releaseinfo>
-
-  </bookinfo>
-
-  &PREFACE;
-  
-  <part id="usage">
-    <title>Usando Evolution</title>
-     <partintro>
-      <para>
-        La primera parte del manual de
-        <application>Evolution</application> describe como usar
-        <application>Evolution</application> para el correo, el
-        administrador de contactos y como fijar citas y tareas.
-        Según vaya utilizando estas cosas descubrirá que hay más de
-        una manera de hacer las cosas, y puede puede elegir el método
-        que más le guste.
-      </para>
-    </partintro>
-
-    &USAGE-MAINWINDOW;
-    &USAGE-EXEC-SUMMARY;
-    &USAGE-MAIL;
-    &USAGE-CONTACT;
-    &USAGE-CALENDAR;
-<!--   &USAGE-NOTES; -->
-    &USAGE-SYNC; 
-    &USAGE-PRINT;
-  </part>
-  <part id="config">
-  <title>Configurando y administrando Evolution</title>
-    <partintro>
-      <para>
-        <application>Evolution</application> es altamente configurable.
-        Normalmente, cuando los desarrolladores dicen esto, significa que
-        no lo han probado a fondo y que dejan a otros programadores que se
-        "configuren" ellos mismos un sistema que funcione. En el caso de
-        <application>Evolution</application>, "configurable" significa
-        lo que debe.  Significa que, aunque puede esperar que el programa
-        funcione perfectamente bien con sus opciones por defecto, además
-        es sencillo alterar su comportamiento entre una amplia gama, para
-        que encaje exactamente con sus necesidades.  Esta parte del libro
-        describirá ese proceso, desde la vista superficial del Asistente
-        de Configuración hasta una visión a fondo de los diálogos de
-        preferencias.
-      </para>
-    </partintro>
-
-    &CONFIG-SETUPASSIST;
-    &CONFIG-PREFS;
-    &CONFIG-SYNC;
-  </part>
-
-  <part>  
-    <title>Referencia extensa de los Menus</title>
-    <partintro>
-      <para>
-        La siguiente referencia cubre todos, o casi todos, los menús y los
-        comandos de los menús que le ofrece
-        <application>Evolution</application>.
-      </para>
-    </partintro>
-    &MENUREF;
-  </part>
- 
-  &APX-GLOSS;
-  &APX-BUGS;
-  &APX-AUTHORS; 
-</book>
-
-
-
-
-
-
-
-
-
-
-
diff --git a/help/es/menuref.sgml b/help/es/menuref.sgml
deleted file mode 100644
index 4e13032213..0000000000
--- a/help/es/menuref.sgml
+++ /dev/null
@@ -1,1477 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="menuref">
-  <title>Referencias de los Menús</title>
-  <para>
-    Los menús de <application>Evolution</application> puede que no tengan el
-    secreto de la felicidad, pero lo que contienen son todas las
-    posibilidades de <application>Evolution</application>. Esta sección
-    servirá como referencia de todos esos menús, y las posibilidades que le
-    ofrecen.
-  </para>
-  <para>
-    Ademas, las herramientas de edición de mensajes, citas, y
-    contactos todas tienen barras de herramientas propias. De izquierda a
-    derecha, los menús que tiene disponible cuando está leyendo el correo
-    son: <guimenu>Archivo</guimenu>, <guimenu>Editar</guimenu>,
-    <guimenu>Vista</guimenu>, <guimenu>Configuración</guimenu>,
-    <guimenu>Mensaje</guimenu>, <guimenu>Carpeta</guimenu>and
-    <guimenu>Ayuda</guimenu>.
-
-  </para>
-  <para>
-    Los menús en <application>Evolution</application> son sensitivos al
-    contexto, lo que significa que varian dependiendo de lo que esté
-    haciendo.  Si está leyendo su correo, tendrá menús relacionados con el
-    correo; para su calendario, tendrá opciones relacionadas con
-    calendarios.  Algunos menús, naturalmente, como
-    <guimenu>Ayuda</guimenu> y <guimenu>Archivo</guimenu> no cambian mucho,
-    si es que lo hacen, porque son funciones más universales.  Pero usted
-    nunca marcará una tarjeta de dirección como "leidao", o pondra
-    recurrencia a un mensaje que ha recivido. Dependiendo de si esta mirando
-    el correo, los contactos, o la información del calendario. 
-  </para>
-
-
-
-  <sect1 id="menuref-universal">
-    <title>Menús que son iguales en todas partes</title>
-    <para>
-      Los menús <guimenu>Archivo</guimenu> y <guimenu>Ayuda</guimenu> de la
-      ventana principal de <application>Evolution</application> no cambian,
-      porque se refieren a elementos globales.  Otros menús tienen
-      contenidos que cambian dependiendo del contexto.
-    </para>
-   
- <sect2 id="menuref-universal-file">
-      <title>Menú Archivo</title>
-      <para>
-	<variablelist>
-
-	  <varlistentry>
-	    <term><guisubmenu>Nuevo...</guisubmenu> Submenu</term>
-	    <listitem><para>
-		<itemizedlist>
-		  <listitem><para>
-		      <guimenuitem>Carpeta</guimenuitem> &mdash;
-		       Crear una nueva carpeta. Vea <xref 
-		       linkend="usage-mainwindow-folderbar">
-		       para más información acerca de las carpetas.
-		    </para></listitem>
-		  <listitem><para>
-		      <guimenuitem>Atajo</guimenuitem> &mdash;
-		       Crear un nuevo Atajo en la Barra de Atajos.
-		    </para></listitem>
-		  <listitem><para>
-		      <guimenuitem>Mensaje de Correo</guimenuitem> &mdash;
-		       Escribir un nuevo mensaje de correo. Cubierto en
-		       <xref linkend="usage-mail-getnsend-send">.
-		    </para></listitem>
-		  <listitem><para>
-		      <guimenuitem>Cita</guimenuitem> &mdash;
-		       Concertar una nueva cita en su calendario. Vea <xref
-			linkend="usage-calendar-apts-basic"> para más información.
-		    </para></listitem>
-		  <listitem><para>
-		      <guimenuitem>Tarea</guimenuitem> &mdash;
-		       Escriba un nuevo elemento para-hacer en su lista de tareas.
-		       Cubierto en 
-		       <xref linkend="usage-calendar-todo">.
-		    </para></listitem>
-		</itemizedlist>
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Ir a Carpeta</guimenuitem></term>
-	    <listitem><para>
-               Ver los elementos de una carpeta en particular.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Crear Nueva Carpeta</guimenuitem></term>
-	    <listitem><para>
-		 Este elemento ya no pertenece aquí.
-	      </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Imprimir Mensaje</guimenuitem></term>
-	    <listitem><para>
-		 Imprime el mensaje actual.
-	      </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Salir</guimenuitem></term>
-	    <listitem><para>
-		 Parar de usar <application>Evolution</application>.
-	      </para></listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-
-    <sect2 id="menuref-universal-help">
-      <title>El Menú Ayuda</title>
-      <para>
-      <variablelist>
-	<varlistentry>
-	  <term><guimenuitem>Índice de la Ayuda</guimenuitem></term>
-	  <listitem><para>
-             Muestra la tabla de contenidos de este documento.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Comenzando</guimenuitem></term>
-	  <listitem><para>
-              Una vista rápida, y un resumen de las cosas que
-              <application>Evolution</application> puede hacer por usted.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Usando el Correo</guimenuitem></term>
-	  <listitem><para>
-              Una vista en profundidad del correo de <application>Evolution</application>.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Usando el Calendario</guimenuitem></term>
-	  <listitem><para>
-             Una guía paso a paso sobre como usar el calendario.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Usando el Administrador de Contactos</guimenuitem></term>
-	  <listitem><para>
-            Manejese con el administrador de contactos.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Enviar Reportes de Fallo</guimenuitem></term>
-	  <listitem><para>
-             Si usted no se los dice, no podrán arreglarlos.  Selececion esta opción para hacer saber a
-             los desarrolladores lo que falla.
-           </para></listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guimenuitem>Acerca de Evolution</guimenuitem></term>
-	  <listitem><para>
-              Muestra una ventana con información sobre la aplicación y sus autores.
-              Tiene la misma información que <xref linkend="authors">.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="menuref-exec">
-   <title>Menús del Resumen de Trabajo</title>
-    <para>
-      Dejaremos esta sección en blanco hasta que la UI se estabilize un
-      poco más.
-    </para>
-  </sect1>
-
-
-
-  <sect1 id="menuref-mail">
-    <title>Menús del Correo</title>
-    <para>
-       El Correo de <application>Evolution</application> tiene más menús
-       especializados, y más opciones de menú especializadas, que cualquier
-       otra parte de la aplicación.
-    </para>
-   
-    <sect2 id="menuref-mail-edit">
-      <title>El Menú Edición</title>
-      <para>
-        Este menú está actualmente vacio.
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-mail-view">
-      <title>El Menú Ver del Correo</title>
-      <para>
-        Este menú le permite controlar el modo en que
-        <application>Evolution</application> le muestra su información.
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Mostrar Barra de Atajos</guimenuitem></term>
-	    <listitem><para>
-              Active y desactive la barra de atajos con esta opción.       
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Mostrar Barra de Carpetas</guimenuitem></term>
-	    <listitem><para>
-             Active y desactive la barra de carpetas con esta opción. 
-             Vea <xref linkend="usage-mainwindow-folderbar"> para 
-             más información acerca de la barra de carpetas.           
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Lista de Mensajes Encadenados</guimenuitem></term>
-	    <listitem><para>
-               Esta opción controla si la lista de sus mensajes se muestra siguiendo la cadena de la discusión 
-               o por otro criterio.  La ordenación por defecto es por fecha.
-               Vea <xref linkend="usage-mail-listorder"> para más
-información acerca de 
-               como ordenar la lista de mensajes.
-            </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-mail-tools">
-      <title>El Menú Configuración del Correo</title>
-      <para>
-      <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Filtros de Correo</guimenuitem></term>
-	    <listitem><para>
-             Edite aqui sus filtros de correo.  
-             Vea <xref linkend="usage-mail-organize-filters">
-             para más información acerca de los filtrar correo.
-           </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Editor de Carpetas Virtuales</guimenuitem></term>
-	    <listitem><para>
-              Cree, edite, y borre carpetas virtuales (<glossterm>vFolders</glossterm>)
-               con esta herramienta. 
-              Para aprender acerca de como usar carpetas virtuales con su 
-              correo, vea <xref linkend="usage-mail-organize-vfolders">.
-           </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Configuración del Correo</guimenuitem></term>
-	    <listitem><para> 
-               Herramientas para configurar las preferencias de sus cuentas de correo.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Administrar Suscripciones</guimenuitem></term>
-	    <listitem><para>
-               Herramientas para suscribirse a grupos de noticias y para las carpetas IMAP.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Olvidar Contraseña</guimenuitem></term>
-	    <listitem><para>
-              Esta opción hara que <application>Evolution</application>
-	      olvide sus contraseñas.
-            </para></listitem>
-	  </varlistentry>
-	  
-	</variablelist>
-       </para>
-    </sect2>
-
-    <sect2 id="menuref-mail-folder">
-      <title>El Menú Carpetas del Correo</title>
-      <para>
-          Estos elementos de este menú se refieren a las carpetas de 
-          correo de <application>Evolution</application>.
-      </para>
-      <para>
-          Usted puede:
-          <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Marcar todos como Leídos</guimenuitem></term>
-	    <listitem><para>
-	      <application>Evolution</application> se acuerda de que mensajes ha 
-	      leído;  para marcar todos los mensajes de una carpeta como leídos elija esta opción.
-	      Puede marcar un solo mensaje como leído pulsando con el botón derecho en la barra de mensajes.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Borrar Todos</guimenuitem></term>
-	    <listitem><para>
-	      Esta es la opción favorita de todo aquel con demasiado correo basura: un click, y borra 
-	      todos los mensajes de la carpeta actual. 
-	    </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Comprimir</guimenuitem></term>
-	    <listitem><para>
-                 Vacia la carpeta de la papelera, borrando los mensajes permanentemente. 
-                 Un vez que ha echo esto, son eliminados para siempre.
-	       </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Configurar Carpeta</guimenuitem></term>
-	    <listitem><para>
-              Use esta opción para seleccionar el formato de archivo en el
-              que <application>Evolution</application> guarda el correo.
-              Puede elegir entre archivos tipo
-              <systemitem><filename>mbox</filename></systemitem> estandar
-              al estilo UNIX, o el formato
-              <systemitem><filename>mh</filename></systemitem>.
-              Convertir buzones grandes tarda mucho tiempo, y es una buena
-              idea tener una copia de seguridad antes de la conversión.
-           </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-       </para>
-    </sect2>
-
-  <sect2 id="menuref-mail-message">
-      <title>El Menú Mensajes del Correo</title>
-      <para>
-          Las opciones de este menú se refieren a los mensajes de correo de
-          <application>Evolution</application>. La mayoría de ellos
-          requieren que haya un mensaje seleccionado, y están tambien
-          disponibles pulsando con el botón derecho sobre un mensaje de la
-          lista de mensajes.
-      </para>
-      <para>
-          <variablelist>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Abrir en una Nueva Ventana</guimenuitem></term>
-	    <listitem><para>
-	       Muestra el mensaje seleccionado en una nueva ventana.
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Editar Mensaje</guimenuitem></term>
-	    <listitem><para>
-	      Abre el mensaje seleccionado en el compositor de mensajes.  Solo
-              puede editar mensajes que haya escrito usted: drafts y mensajes en 
-              la carpeta <guilabel>Enviados</guilabel>.
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Imprimir Mensaje</guimenuitem></term>
-	    <listitem><para>
-	       Muestra la ventana de <interface>Vista Previa</interface>, 
-               lista para imprimir.
-	   </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Responder al Remitente</guimenuitem></term>
-	    <listitem><para>
-	       Abre una ventana con el compositor de mensajes con la dirección
-               puesta al autor del mensaje.  Cubierto en detalle en 
-               <xref linkend="usage-mail-getnsend-send-reply">.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Responder a Todos</guimenuitem></term>
-	    <listitem><para>
-	       Abre una ventana con el compositor de mensajes con la dirección
-      puesta al autor del mensaje y a todos los destinatarios conocidos.
-                Cubierto en detalle en <xref linkend="usage-mail-getnsend-send-reply">.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Reenviar</guimenuitem></term>
-	    <listitem><para>
-	       Adjunta el cuerpo del mensaje seleccionado a un nuevo mensaje.
-               Cubierto en detalle en  <xref linkend="usage-mail-getnsend-fwd">.               
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Borrar Mensaje</guimenuitem></term>
-	    <listitem><para>
-	       Marca un mensaje para borrar.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Mover Mensaje</guimenuitem></term>
-	    <listitem><para>
-	       Elije una carpeta a la cual enviar este mensaje.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Copiar Mensaje</guimenuitem></term>
-	    <listitem><para>
-	       Copia el mensaje seleccionado a otra carpeta.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder según el Asunto</guimenuitem></term>
-	    <listitem><para>
-	       Este elemento, y los tres que le siguen, crearán carpetas  
-  virtuales que podrá personalizar más o guardar tal cual. Este creará una
-              carpeta virtual que mostrará todos los mensajes que contengan la 
-               línea del asunto del mensaje seleccionado.                
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder según el Remitente</guimenuitem></term>
-	    <listitem><para>
-	       Crea una carpeta virtual para poner en ella todos los mensajes del
-                 remitente del mensaje seleccionado.
-	      </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>VFolder según Destinatarios</guimenuitem></term>
-	    <listitem><para>
-	       Crea una carpeta virtaul para poner en ella todos enviados a los 
-               destinatarios del mensaje seleccionado.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filtro según el Asunto</guimenuitem></term>
-	    <listitem><para>
-	       Este elemento, y los tres siguientes, crearán filtros para los que 
-               debe elegir una acción.  Puede conservar el criterio como 
-               está, o modificarla como quiera. Este creará un filtro que
-               afectará a todos los mensajes que contengan la línea del 
-               asunto del mensaje seleccionado.                
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filtrar según Remitente</guimenuitem></term>
-	    <listitem><para>
-	       Crea un filtro que afectará a todos los mensajes del remitente del
-               mensaje seleccionado.
-	      </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Filtrar según Destinatarios</guimenuitem></term>
-	    <listitem><para>
-	       Crea un filtro que afectará a todos los mensajes dirigidos a los 
-               destinatarios del mensaje seleccionado.
-	      </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-       </para>
-    </sect2>
-
-   <sect2 id="menuref-mail-messagelistheader">
-      <title>El Menú del Botón Derecho en la Cabecera</title>
-      <para>
-         En la parte superior de la lista de mensajes está la cabecera de
-         la lista de mensajes. Puede pulsar en cualquiera de los títulos
-         individuales &mdash;
-         <guilabel>Asunto</guilabel>, por ejemplo, para ordenar la lista
-         de mensajes por ese atributo.  Eso si, si pulsa el botón derecho
-         sobre uno de los títulos, obtendrá el siguiente menú:
-      </para>
-
-      <para>
-          <variablelist>
-
-	  <varlistentry>
-	      <term><guimenuitem>Ordenar Ascendentemente</guimenuitem></term>
-	      <listitem><para>
-		 Ordenar la lista, en orden ascendente, según el atributo sobre el que
-                 pulsó.
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Ordenar Descendentemente</guimenuitem></term>
-	      <listitem><para>
-		 Ordenar la lista en orden descendente.
-	      </para></listitem>
-	    </varlistentry>
-  
-	  <varlistentry>
-	      <term><guimenuitem>Desordenar</guimenuitem></term>
-	      <listitem><para>
-		 Deshacer cualquier ordenación mediante este atributo, y dejar la lista
-                 según el orden anterior.
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Agrupar según este Campo</guimenuitem></term>
-	      <listitem><para>
-		 En lugar de ordenar los mensajes, los agrupa en cajas. 
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Agrupar por Caja</guimenuitem></term>
-	      <listitem><para> Si tiene los mensajes agrupados en cajas,
-	      puede agrupar del mismo modo las cajas, eligiendo este
-	      elemento.  </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Quitar esta columna</guimenuitem></term>
-	      <listitem><para>
-		 Elija esto para quitar una columna de la vista de la lista de mensajes.
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Selector de Campos</guimenuitem></term>
-	      <listitem><para>
-		 Abre una paleta de columnas. Usted puede arrastra las columnas
-		 que quiera desde la paleta hasta la posición en la barra de cabecera
-		 de la lista de mensajes; aparecen flechas rojas cunado se acerca los
-		 suficiente a una posición posible.</para>
-                 
-              <para>
-                 Sus opciones son: 
-                 <itemizedlist>
-                     <listitem><para>
-                         <guiicon>Un Sobre</guiicon> el cual indica cuando un mensaje a sido leído (cerrado para no leído, abierto para leído).
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guiicon>Un Signo de Exclamación</guiicon> para la prioridad
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guiicon>Un Pingüino</guiicon> el cual indica algo, aunque no estoy seguro de que.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guiicon>Un Clip</guiicon> el cual indica que hay un adjunto en el mensaje.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>De</guilabel>, para el campo <guilabel>De</guilabel> del mensaje.
-                     </para></listitem>
-                     <listitem><para>
-                         <guilabel>Asunto</guilabel>, para el campo <guilabel>Asunto</guilabel> del mensaje.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>Fecha</guilabel>, para la fecha y la hora en que se mandó el mensaje.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>Recibido</guilabel>, para la fecha y la hora en la que recibió en mensaje. 
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>A</guilabel>, para el campo <guilabel>A</guilabel>.
-                     </para></listitem>
-
-                     <listitem><para>
-                         <guilabel>Tamaño</guilabel>, para el tamaño del mensaje.
-                     </para></listitem>
-		  </itemizedlist>
-             </para>   
-
-	      </listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Alineación</guimenuitem></term>
-	      <listitem><para> Use este elemento para decidir sobre la alineación
-	      de los atributos de los mensajes en sus columnas.
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Mejor Colocación</guimenuitem></term>
-	      <listitem><para>
-		 Modifica el ancho de las columnas de la lista de mensajes para
-maximizar la cantidad de información mostrada.
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	      <term><guimenuitem>Formato de las Columnas...</guimenuitem></term>
-	      <listitem><para>
-		 Este elemento no está disponible todavía.
-	      </para></listitem>
-	    </varlistentry>
-
-
-	  <varlistentry>
-	      <term><guimenuitem>Personalizar
-	      Vistas...</guimenuitem></term> <listitem><para> Abre una
-	      caja de diálogo que le permite elegir una ordenación compleja para
-	      su lista de mensajes, así puede combinar ordenar y agrupar de tantas
-	      maneras como quiera.
-	      </para></listitem>
-	    </varlistentry>
-
-          </variablelist>
-      </para>
-   </sect2>
-  </sect1>
-
-  <sect1 id="menuref-mail-editor">
-    <title>Los Menús del Compositor de Mensajes</title>
-    <para>
-      La ventana de composición de mensajes tiene su propio juego de menús:
-      <guimenu>Archivo</guimenu>, que controla las operaciones sobre los
-      archivos y los datos, <guimenu>Editar</guimenu>, para la edición de
-      textos, <guimenu>Formato</guimenu>, que controla el formato de los
-      mensajes que envía, <guimenu>Vista</guimenu>, que determina como ve el
-      mensaje, y <guimenu>Insertar</guimenu>, que tiene herramientas para
-      incluir archivos y otros objetos en los mensajes.  Aquí esta lo que
-hay en ellos:
-    </para>
-    <sect2 id="menuref-mail-editor-file">
-      <title>El Menú Archivo del Compositor de Mensajes</title>
-      <para>
-        <variablelist>
-	  <varlistentry>
-	      <term><guimenu>Abrir</guimenu></term>
-	      <listitem><para>
-		 Abre un archivo de texto o el borrador de un mensaje.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Guardar</guimenu></term>
-	      <listitem><para>
-		 Guarda un mensaje de correo como un archivo de texto.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Guardar Como</guimenu></term>
-	      <listitem><para> 
-		Elija un nombre de archivo y un lugar para
-		el mensaje que quiere guardar como un archivo de texto.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Guardar en una Carpeta</guimenu></term>
-	      <listitem><para>
-		 Guarda un mensaje como un borrador, en lugar de como 
-		 un archivo de texto independiente.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Insertar Archivo de Texto</guimenu></term>
-	      <listitem><para>
-		   Abre un archivo de texto y lo inserta en el mensaje 
-		   actual. (FIXME: belongs under "Insert").
-	      </para></listitem>
-	    </varlistentry>
-	  
-	    <varlistentry>
-	      <term><guimenu>Enviar Ahora</guimenu></term>
-	      <listitem><para>
-		  Envia el mensaje inmediatamente.
-	      </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenu>Enviar más Tarde</guimenu></term>
-	      <listitem><para>
-		  Lo pone en la cola de mensajes 
-	      </para></listitem>
-	    </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenu>Cerrar</guimenu></term>
-	    <listitem><para>
-		 Cierra el compositor de mensajes.  Si no lo ha echo ya, 
-		 <application>Evolution</application>
-		 le preguntará si quiere guardar su mensaje.
-	      </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-mail-editor-edit">
-      <title>El Menú Editar del Compositor de Mensajes</title>
-      <para>
-          El menú <guimenu>Editar</guimenu> en el compositor de mensajes
-          contiene los siguientes elementos.  Los atajos de teclado están
-          al lado de los elementos en los propios menús.
-
-        <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Deshacer</guimenuitem></term>
-	    <listitem><para>
-                Deshace la última acción realizada.
-	    </para></listitem>
-	  </varlistentry>
-
-    	  <varlistentry>
-	    <term><guimenuitem>Rehacer</guimenuitem></term>
-	    <listitem><para>
-               Si cambia de idea sobre Deshacer algo, 
-               siempre puede usar esta opción.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Cotar</guimenuitem></term>
-	    <listitem><para>
-                Elimina el texto seleccionado de la ventana de edición y lo 
-                guarda en la memoria del "portapapeles" del sistema, listo para pegarlo.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Copia</guimenuitem></term>
-	    <listitem><para>
-              Copia el texto seleccionado al portapapeles del sistema sin borrarlo.
-              Entoces el texto puede ser insertado en otra parte con el 
-              comando <guimenuitem>Pegar</guimenuitem>.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Pegar</guimenuitem></term>
-	    <listitem><para>
-                Inserta el contenido del portapapeles del sistema en la 
-                posición del cursor.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Buscar</guimenuitem></term>
-	    <listitem><para>
-               Escriba una frase y encuantra las coincidencias en el cuerpo 
-               del mensaje. Como con 
-               <guimenuitem>Buscar Expresión</guimenuitem>, 
-               <guimenuitem>Buscar de nuevo</guimenuitem>, y
-               <guimenuitem>Remplazar</guimenuitem>, <application>Evolution</application>
-               le ofrecerá la opción de buscar hacia adelante o hacia atras.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Buscar Expresión</guimenuitem></term>
-	    <listitem><para>
-               Si esta familiarizado con las <glossterm>expresiones regulares</glossterm>,
-                ha veces llamadas "regexes", puede buscar cosas más complicadas, 
-               usando comodines y lógica booleana.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Buscar de nuevo</guimenuitem></term>
-	    <listitem><para>
-              Repite la última búsqueda.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Remplazar</guimenuitem></term>
-	    <listitem><para>
-               Escriba una palabra o frase y la palabra o frase por la que le gustaría
-               reemplazarla.  
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Propiedades</guimenuitem></term>
-	    <listitem><para>
-               Esta opción muestra el Capplet de Propiedades del Compositor de Mensajes,
-               una parte del Centro de Control de GNOME ue determina la 
-               asociación de teclas en el compositor de mensajes.  La ayuda para este capplet está 
-               disponible directamente en el Centro de Control.
-               (FIXME: Write that help doc too) (FIXME: this is in the wrong place!)
-	    </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-format">
-      <title>El Menú Formato del Compositor de Mensajes</title>
-      <para> 
-        El menú <guimenu>Formato</guimenu> solo tiene una opción:
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>HTML</guimenuitem></term>
-	    <listitem><para>
-                 Activa el modo HTML para el compositor de mensajes.  Cuando esta seleccionado, 
-                 los mensajes se muestran y se envian en HTML.  Si ha escrito un mensaje
-                 en HTML y desactiva la opción HTML, se perderá la mayor parte del formato.
-                 Eso si, <application>Evolution</application> intentará consevar los
-                 espacios y eliminar el formato con cuidado.
-	    </para></listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-view">
-      <title>El Menú Ver del Compositor de Mensajes</title>
-      <para>
-        El menú <guimenu>Vista</guimenu> controla la manera en que se
-        muestran sus mensajes, y cuanto del mensaje, de su cabecera y de los
-        adjuntos se muestra.  Contiene:
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Mostrar Adjuntos</guimenuitem></term>
-	    <listitem><para> 
-              Activa el mostrar los adjuntos.  Cuando esta opción está seleccionada,
-              <application>Evolution</application> creará una caja separada
-de la ventana
-              del compositor de mensajes para mostrar que archivos adjuntos está añadiendo
-              al mensaje. 
-	    </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-mail-composer-insert">
-      <title>El Menú Insertar del Compositor de Mensajes</title>
-      <para>
-        El menú <guimenu>Insertar</guimenu> contiene herramientas que le
-        permiten incluir imágenes, reglas horizontales, y otros objetos en
-        el cuerpo del mensaje. Las herramientas son:
-        <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Imagen</guimenuitem></term>
-	    <listitem><para> 
-               Esta herramienta le pedirá que seleccione una imagen para
-               insertarla en su mensaje en HTML.  Para mensajes de texto,
-               esto es lo mismo que adjuntar la imagen.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Enlace</guimenuitem></term>
-	    <listitem><para> 
-              Abre la <interface>ventana de creación de enlaces</interface>,
-              que le permite especificar la URL y un descripción para el
-              enlace de su mensaje.  Tan solo funciona con mensajes en
-              HMTLs.
-	    </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Regla</guimenuitem></term>
-	    <listitem><para>    
-             Abre el <interface>diálogo de creación de reglas horizontales</interface>, el cual le permite
-	     crear una regla horizontal en HTML.  Para más información, vea
-	     <xref linkend="usage-mail-getnsend-send-html">.
-             Esta herramienta solo funciona con mensajes en HTML.
-	     </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Archivo de Texto</guimenuitem></term>
-	    <listitem><para>
-	       Abre un archivo de texto y lo inserta en el mensaje actual.
-               Esta herramienta funciona tanto con mensajes de texto como
-               mensajes en HTML.
-	      </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-  </sect1>
-
-    <sect1 id="menuref-cal">
-    <title>Los Menús del Calendario</title>
-    <para>
-      La ventana principal del calendario tiene los mismos menús que la
-      ventana principal del cliente de correo.  Aunque, sus contenidos
-      varian de varios modos.
-    </para>
-    <sect2 id="menuref-cal-edit">
-      <title>El Menú Editar del Calendario</title>
-      <para>
-         El contenido del menu Editar no esta todavía fijo, así que no lo
-         voy a documentar todavía. (Esto significa ARREGLAME). Deberian
-         ser:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Elemento</guimenuitem></term>
-	    <listitem><para>
-              Descripción
-           </para></listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guimenuitem>Elemento</guimenuitem></term>
-	    <listitem><para>
-              Descripción
-           </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	  <term><guimenuitem>Elemento</guimenuitem></term>
-	  <listitem><para>
-              Descripción
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="menuref-cal-view">
-      <title>El Menú Ver del Calendario</title>
-      <para>
-        El menú <guimenu>Vista</guimenu> del calendario contiene las siguientesins opciones:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Mostrar la Barra de Atajos</guimenuitem></term>
-	    <listitem><para>
-              Active y desactive la barra de atajos con esta opción.    
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Mostrar la Barra de Carpetas</guimenuitem></term>
-	    <listitem><para>
-             Active y desactive la barra de carpetas con esta opción. 
-             Vea <xref linkend="usage-mainwindow-folderbar"> para 
-             más información acerca de la barra de carpetas.     
-           </para></listitem>
-	  </varlistentry>
-		  
-	  <varlistentry>
-	  <term><guimenuitem>Vista por Días</guimenuitem></term>
-	  <listitem><para>
-             Cambia el calendario a la vista diaria.
-           </para></listitem>
-	  </varlistentry>	  
-
-	  <varlistentry>
-	  <term><guimenuitem>Vista Cinco Días</guimenuitem></term>
-	  <listitem><para>
-             Muestra cinco días del calendario de una vez. 
-           </para></listitem>
-	  </varlistentry>	  
-
-	  <varlistentry>
-	  <term><guimenuitem>Vista por Semanas</guimenuitem></term>
-	  <listitem><para>
-             Cambia el calendario a la vista semanal.
-           </para></listitem>
-	  </varlistentry>
-  
-	  <varlistentry>
-	  <term><guimenuitem>Vista por meses</guimenuitem></term>
-	  <listitem><para>
-             Vea todo un mes al tiempo.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-settings">
-      <title>El Menú Configuración del Calendario</title>
-      <para>
-         Este menú está vacío.
-      </para>
-    </sect2>
-
-  </sect1>
-
-  <sect1 id="menuref-cal-editor">
-    <title>Los Menús del Editor de Citas</title>
-    <para>
-    El editor de citas tiene sus propios menús, para ayudarle a usar sus
-    amplias posibilidades.
-    </para>
-    
-    <sect2 id="menuref-cal-editor-file">
-      <title>El Menú Archivo del Editor de Citas</title>
-      <para>
-         Este menú contiene varias opciones, incluyendo un sub-menú <guisubmenu>Nuevo</guisubmenu> que es identico al del 
-         <link linkend="menuref-universal-file">menú archivo de la ventana principal</link>.
-         Sus otros contenidos son:
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Enviar</guimenuitem></term>
-	    <listitem><para>
-             Abre un mensaje de correo con la cita adjunta a el.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Guardar</guimenuitem></term>
-	    <listitem><para>
-              Guarda esta cita en la posición y nombre actual. Si todavía no ha elegido
-              una posición y un nombre, esto es lo mismo que <guimenuitem>Guardar Como</guimenuitem>.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Guaradar Como</guimenuitem></term>
-	    <listitem><para>
-              Eliga una posición y un nombre para esta cita, y guardela.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Borrar</guimenuitem></term>
-	    <listitem><para>
-              Borra la cita.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Mover a una Carpeta</guimenuitem></term>
-	    <listitem><para>
-              Elija una carpeta, y mueva a ella la cita.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Copiar a una Carpeta</guimenuitem></term>
-	    <listitem><para>
-              Elija una carpeta, y ponga en ella una copia de la cita.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	   <term><guimenuitem>Sub-menú de Configuración de Página</guimenuitem></term>
-	    <listitem><para>
-             Este menú contiene dos opciones:
-                <itemizedlist>
-		  <listitem><para>
-                   <guimenuitem>Estilo del Memorando</guimenuitem> &mdash;
-                    FIXME: What does this do?
-                   </para></listitem>
-
-		  <listitem><para>
-                    <guimenuitem>Definir Estilos de Impresión</guimenuitem> &mdash;
-                    FIXME: What does this do?
-                  </para></listitem>
-		</itemizedlist>
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Vista Previa</guimenuitem></term>
-	    <listitem><para> Muestra el aspecto que tendrán su cita si la
-      imprime. Vea <xref linkend="usage-print">
-	    para más detalles sobre imprimir y la función de Vista Previa.
-	    </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Imprimir</guimenuitem></term>
-	    <listitem><para>
-              Imprime la cita sin vista previa.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Propiedades</guimenuitem></term>
-	    <listitem><para>
-             FIXME: What does this do?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Cerrar</guimenuitem></term>
-	    <listitem><para>
-             Cierra la ventana del editor de citas.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-edit">
-      <title>El Menú Editar del Editor de Citas</title>
-      <para>
-         ARREGLAME: este menú esta copiado y pegado completamente de otro
-         sitio.
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-view">
-      <title>El Menú Ver del Editor de Citas</title>
-      <para>
-         Este menú le permite ver distintas citas, y configurar la forma de
-         verlas, sin tener que volver a la <interface>Ventana 
-         Principal</interface>. Contiene:
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guisubmenu>Previa</guisubmenu></term>
-	    <listitem><para>
-               La opción de este sub-menú le llevará a la cita anterior a
-               la actual. (FIXME: describe).
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guisubmenu>Suiguiente</guisubmenu></term>
-	    <listitem><para>
-               La opción de este sub-menú le llevará a la cita programada
-               para despues de la actual. (FIXME: describe).
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Calendario</guimenuitem></term>
-	    <listitem><para>
-               FIXME: What does this item do?
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guisubmenu>Barras de Herramientas</guisubmenu></term>
-	    <listitem><para>
-             El sub-menú <guisubmenu>Barras de Herramientas</guisubmenu> 
-             le permite elegir que barras de herramientas son mostradas en
-             el <interface>Editor de Citas</interface>. Estas son:
-             <itemizedlist>
-		  <listitem><para>
-                    <guimenuitem>Estandar</guimenuitem> &mdash;
-                    Activa y desactiva la barra de herramientas estandar.
-                   </para></listitem>
-
-		  <listitem><para>
-                    <guimenuitem>Formato</guimenuitem> &mdash;
-                    Activa y desactiva la barra de herramientas de formato.
-                   </para></listitem>
-	
-		  <listitem><para>
-                    <guimenuitem>Personalizada</guimenuitem> &mdash;
-                    Selecciona los contenidos de las barras de herramientas de formato y de la estandar.
-                   </para></listitem>
-		</itemizedlist>
-            </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-insert">
-      <title>El Menú Insertar del Editor de Citas</title>
-      <para>
-        Este menú contiene: (FIXME: Insert Content Here)
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Archivo</guimenuitem></term>
-	    <listitem><para>
-             Elija un archivo para incluir a la cita o al petición de cita.
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Elemento</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Objeto</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-format">
-      <title>El Menú Formato del Editor de Citas</title>
-      <para>
-         Thite menú contiene dos opciones, ninguna de las cuales tiene
-         funcionalidad alguna todavía:
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Fente</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Parrafo</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-tools">
-      <title>El Menú Herramientas del Editor de Citas</title>
-      <para>
-         Este menú contiene cuatro opciones, incluyendo el sub-menú
-         <guisubmenu>Formularios</guisubmenu>, el caul le permite modificar
-         los formularios de los calendararios y crear sus propias entradas.
-         Esto todavia no funciona.
-
-         <variablelist>
-
-	  <varlistentry>
-	    <term><guimenuitem>Corrector Ortográfico</guimenuitem></term>
-	    <listitem><para>
-              Comprueba la ortografía en las entradas del calendario.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Comprobar Nombres</guimenuitem></term>
-	    <listitem><para> Comprueba los nombres aquí enumerados contra los de
-	    su agenda de direcciones.
-            </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guimenuitem>Agenda de Direcciones</guimenuitem></term>
-	    <listitem><para>
-             FIXME: ?
-           </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guisubmenu>Formularios</guisubmenu> Sub-menú</term>
-	    <listitem><para>
-               El sub-menú Formularios le permite modificar la apariencia de
-	       de los Formularios del Calendario. 
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-actions">
-      <title>El Menú Acciones del Editor de Citas</title>
-      <para>
-        Este menú contiene:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Fijar una Reunión</guimenuitem></term>
-	    <listitem><para>
-              Aparece la ventana de <interface>Invitación de Reunión</interface>, 
-              descrita en <xref linkend="usage-calendar-apts">.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Cancelar Invitación</guimenuitem></term>
-	    <listitem><para>
-              Cancela el evento, notificandoselo a todos los asistentes. Puede que le pida que 
-              especifique un mensaje.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Reenviar como vCalendar</guimenuitem></term>
-	    <listitem><para>
-              Abre el compositor de mensajes con el evento actual adjunto.
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Reenviar como Texto</guimenuitem></term>
-	    <listitem><para>
-              Abre el compositor de mensajes con una descripción en texto del evento actual
-              incluida en el cuerpo del mensaje.
-           </para></listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="menuref-cal-editor-help">
-      <title>El Menú Archivo del Editor de Citas</title>
-      <para>
-         Este menú está vacío.
-      </para>
-    </sect2>
-
-  </sect1>
-
-  <sect1>
-    <title>Menús del Administrador de Contactos</title>
-    <para>
-     El administrador de contactos tiene seis menús:
-     <guimenu>Archivo</guimenu>, <guimenu>Editar</guimenu>,
-     <guimenu>Vista</guimenu>, <guimenu>Configuración</guimenu>,
-     <guimenu>Herramientas</guimenu>, y
-     <guimenu>Ayuda</guimenu>.
-    </para>
-
-    <sect2 id="menuref-contact-edit">
-      <title>Menú Editar del Administrador de Contactos</title>
-      <para>
-         Este menú está vacío.
-      </para>
-    </sect2>
-
-
-    <sect2 id="menuref-contact-view">
-      <title>Menú Ver del Administrador de Contactos</title>
-      <para>
-        Este menú contiene las siguiente opciones:
-
-         <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Mostrar Barra de Atajos</guimenuitem></term>
-	    <listitem><para>
-              Active y desactive la barra de atajos con esta opción.          
-           </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guimenuitem>Muestra la Barra de Carpetas</guimenuitem></term>
-	    <listitem><para>
-             Active y descative la barra de carpetas con esta opción. 
-             Vea <xref linkend="usage-mainwindow-folderbar"> para 
-             más información acerca de la barra de carpetas.     
-           </para></listitem>
-	  </varlistentry>
-		  
-	  <varlistentry>
-	  <term><guimenuitem>Como un Tabla</guimenuitem> / <guimenuitem>As Minicards</guimenuitem></term>
-	  <listitem><para>
-             Vea sus contactos como una tabla.  
-             Cuando esta en el modo tabla, está opción del menú aparece
-             como <guimenuitem>Como Minitarjetas</guimenuitem>, y vuelve a
-             cambiar la vista al formato minitarjetas.
-           </para></listitem>
-	  </varlistentry>	  
-	</variablelist>      
-      </para>
-    </sect2>
-
-   <sect2 id="menuref-contact-tools">
-      <title>Menú Herramientas del Administrador de Contactos</title>
-      <para>
-         Este menú contiene una opción:
-
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Buscar un
-	    Contacto</guimenuitem></term> <listitem><para> Abre una ventana
-	    para una busqueda en profundidad. <xref
-	    linkend="contact-search"> describe como usar esta característica.
-	    </para></listitem>
-            </varlistentry>
-        </variablelist>
-      </para>
-    </sect2>
-
-
-
-   <sect2 id="menuref-contact-actions">
-      <title>Menú Herramientas del Administrador de Contactos</title>
-      <para>
-         Este menú contiene unia sola opción:
-
-        <variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Nuevo Servidor de Directorio</guimenuitem></term> <listitem><para> Muestra una ventana
-	    de búsqueda en profundidad. <xref
-	    linkend="config-prefs-contact-ldap-add"> describe como usar esta
-	    característica.  </para></listitem>
-            </varlistentry>
-        </variablelist>
-
-      </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="menuref-contact-editor">
-    <title>Los Menús del Editor de Contactos</title>
-    <para>
-       Esta ventana solo tiene un menú: el menú archivo.
-    </para>
-   
-   <sect2 id="menuref-contact-editor-file">
-      <title>Menú Archivo del Editor de Contactos</title>
-      <para>
-         Este menú contiene cinco opciones:
-         <variablelist>
-
-	  <varlistentry>
-	  <term><guimenuitem>Guardar</guimenuitem></term>
-	  <listitem><para>
-             
-           </para></listitem>
-	  </varlistentry>	
-
-	  <varlistentry>
-	  <term><guimenuitem>Guardar como</guimenuitem></term>
-	  <listitem><para>
-              Le permite guardar el contacto como un archivo externo en el 
-              formato <glossterm linkend="vcard">VCard</glossterm>. 
-           </para></listitem>
-	  </varlistentry>	
-
-	  <varlistentry>
-	  <term><guimenuitem>Imprimir</guimenuitem></term>
-	  <listitem><para>
-             Imprime el contacto actual.
-           </para></listitem>
-	  </varlistentry>	
-
-
-	  <varlistentry>
-	  <term><guimenuitem>Borrar</guimenuitem></term>
-	  <listitem><para>
-             Borra el contacto actual.
-           </para></listitem>
-	  </varlistentry>	
-
-  
-	  <varlistentry>
-	  <term><guimenuitem>Cerrar</guimenuitem></term>
-	  <listitem><para>
-              Cierra el Editor de Contactos sin guardar.
-           </para></listitem>
-	  </varlistentry>	
-
-	</variablelist>  
-      </para>
-    </sect2>
-  </sect1>
-  
-
-</chapter>
-
-
-
-
-
-
-
diff --git a/help/es/preface.sgml b/help/es/preface.sgml
deleted file mode 100644
index 4a93aa0046..0000000000
--- a/help/es/preface.sgml
+++ /dev/null
@@ -1,444 +0,0 @@
-<!--
-<!DOCTYPE preface PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-  <preface id="introduction">
-<!-- =============Introduction ============================= -->
-    <title>Introducción</title> 
-
-    <sect1 id="what"> 
-      <title>¿Qué es Evolution, y qué puede hacer por mi?</title>
-      <para>
-       La información no sirve a menos que este organizada y sea accesible.
-       Ni si quiera se merece ese nombre si no puede mirarla y estar
-       <emphasis>informado</emphasis>.
-       El objetivo de <application>Evolution</application> es hacer que las
-       tareas de guardar, organizar, y obtener su información personal sean
-       más fáciles, para que pueda trabajar y comunicarse con otros. Esto
-       es, programa de <glossterm
-       linkend="groupware">trabajo en grupo</glossterm> altamente
-       evolucionado, una parte integral del escritorio conectado a Internet.
-       Por dentro, es una potente base de datos. Por fuera, es una
-       herramienta para ayudarle ha hacer su trabajo.
-      </para>
-      <para>
-        Como parte de proyecto GNOME,
-        <application>Evolution</application> is Software Libre.  El
-        programa y su código fuente están liberados bajo los términos de
-        la <ulink type="help" url="ghelp:gpl"><citetitle>General Public License "Licencia Pública
-        General" (GPL)</citetitle></ulink> de GNU, y la
-        documentación está bajo la <ulink type="help"
-        url="ghelp:fdl"><citetitle>Free Documentation
-        License "Licencia Libre de Documentación"</citetitle></ulink>
-        (FDL). Para más información acerca de la GPL y de la FDL,
-        visite el sitio web de la Free Software Foundation "Fundación para
-        el Software Libre" en <ulink
-        url="http://www.fsf.org">http://www.fsf.org</ulink>.
-      </para>
-      <para>
-        <note>
-           <title>Esta es una liberación de prueba</title>
-           <para>
-             <application>Evolution</application> no esta completa, y
-             todavía tiene muchos fallos.  Por favor ayúdenos a mejorarla
-             informandonos acerca de ellos.  Debe hacerlo enviando reportes
-             de fallo con la <application>Herramienta de Reportes de
-             Fallo</application> de GNOME (conocida como
-             <command>bug-buddy</command> en la línea de comandos).
-          </para>
-        </note>
-      </para>
-
-      <para>
-        <application>Evolution</application> le puede ayudar a trabajar en
-        grupo encargandose del correo, direcciones y otra información
-        de contacto, y uno o más calendarios.  Puede hacerlo en uno o varios
-        ordenadores, conectados directamente o a traves de una red, para una
-        persona o para grandes grupos.
-      </para>
-      <para>
-        El proyecto de <application>Evolution</application> tiene cuatro
-        objetivos principales:
-
-        <itemizedlist>
-	  <listitem>
-	    <para>
-             La aplicación debe ser <emphasis>al mismo tiempo potente
-             y facil de usar</emphasis>. En otras palabras, necesita una
-             interfaz familiar e intuitiva que los usuarios puedan
-             personalizar a su gusto, y los usuarios deben tener acceso a
-             atajos para tareas complicadas.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-              <application>Evolution</application> debe cumplir y
-              sobrepasar los estandares impuestos por otros programas de
-              trabajo en grupo.  Debe tener soporte para la mayor parte de
-              los <glossterm linkend="protocol">protocolos</glossterm>
-              de red para poder integrarse sin problemas con el hardware
-              y los entornos de red existentes.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-               El proyecto debe apoyar a los estandares abiertos y estar
-               abierto a la expansion, para que se pueda convertir en una
-               plataforma de desarollo tanto como en una aplicación.
-               Desde los guiones más simples a la programación de red y
-               componentes más compleja,
-               <application>Evolution</application> debe ofrecer a los
-               desarrolladores un entorno para el desarrollo de aplicaciones
-               de vanguardia.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-               Los datos deben ser seguros:
-               <application>Evolution</application> no debe perder correo,
-               corromper buzones u otra información, ejecutar
-               <glossterm linkend="script">guiones</glossterm> de
-               instruciones arbitrarios o borrar archivos de su disco duro.
-            </para>
-          </listitem>
-	</itemizedlist>
-      </para>
-      <para>
-        <application>Evolution</application> está diseñada para hacer la
-        mayoría de las tareas diarias más rápido.  Por ejemplo, solo
-        requiere una o dos pulsaciones introducir una nueva cita o una
-        tarjeta que le hayan enviado por correo, o enviar un correo a un
-        contacto o a una cita.  <application>Evolution</application>
-        hace las vistas más rápidas y eficientes, para que las búsquedas
-        sean más rápidas y el uso de la memoria sea menor.  Las personas
-        que reciben mucho correo apreciarán las características avanzadas
-        como las <link
-        linkend="usage-mail-organize-vFolders">Carpetas Virtuales</link>,
-        que le permiten guardar búsquedas como si fueran carpetas de correo
-        normales.
-      </para>
-
-  </sect1>
-
-  <sect1 id="aboutbook">
-      <title>Acerca de este Libro</title>
-    <!-- ************** FOLLOWING PARAGRAPH FOR DRAFT ONLY ************* -->
-      <para>
-        Esta versión de la Guía de Usuario de
-        <application>Evolution</application> es un
-        <emphasis>borrador</emphasis>. Describe la versión 0.6 del
-        programa.  Le faltan grandes piezas de información, y muchas de
-        las arecteristicas que describe no están implementadas.
-        Todo el contenido esta sujeto a cambios, especialmente si usted
-        colabora.  Por favor ebvie comentarios sobre la guía a
-        <email>aaron@ximian.com</email> y sobre la traducción a
-        <email>hector@scouts-es.org</email>. Si le gustaría colaborar en la
-        guía por favor pongase en contacto conmigo o vea el <ulink
-        url="http://developer.gnome.org/projects/gdp">sitio
-        web</ulink> del proyecto de Documentación de GNOME.  Este párrafo
-        será eliminado en futuras versiones del manual.
-      </para>
-    <!-- ************* END DRAFT ONLY PARAGRAPH ************** -->
-
-      <para>
-        Thite libro está dividido en dos partes, con varios apendices.
-        La primera parte es una <link linkend="usage">visita
-        guiada</link>&mdash; le explicará como usar
-        <application>Evolution</application>.  Si es nuevo en el uso de
-        <application>Evolution</application> o de los programas de trabajo
-        en grupo en general, esta sección es para usted. La segunda sección,
-        cubriendo la <link linkend="config">configuración</link>, está
-        dirijida a usuarios más avanzados, pero cualquiera que quiera
-        cambiar el aspecto o el comportamiento de
-        <application>Evolution</application> se beneficiará de su lectura.
-        Ademas, hay una <link linkend="menuref">referencia de menús</link>
-        que describe casi todas las posibilidades que ofrece
-        <application>Evolution</application>.
-      </para>
-      <formalpara>
-        <title>Convenios Tipográficos</title>
-	<para>
-          Algunas clases de palabras están escritas con una tipografía especial:
-          <simplelist>
-	    <member><application>Aplicaciones</application></member>
-	    <member><command>Comandos</command> escritos en la línea de comandos</member>
-	    <member><guilabel>Etiquetas</guilabel> de elementos de la interfaz</member>
-
-            <member> La opcciones de los menús aparecen así:
-                       <menuchoice>
-                          <guimenu>Menú</guimenu>
-                          <guisubmenu>Sub-menú</guisubmenu> 
-                          <guimenuitem>Opción del Menú</guimenuitem>
-                     </menuchoice>
-            </member>
-	    <member><guibutton>Butones</guibutton> que puede pulsar</member>
-            <member><userinput>Cualquier cosa que
-            escribe</userinput></member> <member><computeroutput>Salida
-            del ordenador en texto</computeroutput></member>
-            <member><glossterm linkend="apx-gloss">Palabras</glossterm>
-            que están definidas en el <xref linkend="apx-gloss">.</member>
-	  </simplelist>
-        </para>
-      </formalpara>
-  </sect1>
-  <sect1 id="commontasks">
-    <title>Referencia Rápida para Tareas Comunes</title>
-    <para>
-        Puede que quiera copiar esta sección y pegarla a la pared de al lado
-        de su ordenador: es un resumen muy corto de la mayoría de las cosas
-        que querrá hacer con <application>Evolution</application>, y 
-        referencias a las secciones del libro donde encontrará descripciones
-        más profundas de dichas tareas.
-    </para>
-    <sect2 id="quickref-newthings">
-      <title>Abriendo o Creando algo</title>
-      <para>
-         Aquí están los atajos de teclado y las opciones del menú que
-         probablemente sean las que mas use:
-         
-          <variablelist>
-
-	  <varlistentry>
-	    <term>Crear una nueva carpeta</term>
-	    <listitem>
-	      <para>
-                <menuchoice><guimenu>Archivo</guimenu><guisubmenu>Nuevo</guisubmenu>
-                <guimenuitem>Carpeta</guimenuitem></menuchoice> o
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>C</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Crear un nuevo Atajo en la Barra de Evolution</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>Archivo</guimenu>
-		  <guisubmenu>Nuevo</guisubmenu>
-		  <guimenuitem>Atajo de Evolution</guimenuitem> </menuchoice> o 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>A</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Crear un nuevo mensaje de correo:</term>
-	    <listitem>
-	      <para>
-                Use
-                <menuchoice><guimenu>Archivo</guimenu><guisubmenu>Nuevo</guisubmenu><guimenuitem>Mensaje de 
-                Correo</guimenuitem>  </menuchoice> o 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>M</keycap>
-                </keycombo>
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Crear una nueva Cita</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>Archivo</guimenu>
-		  <guisubmenu>Nuevo</guisubmenu>
-		  <guimenuitem>Cita</guimenuitem> </menuchoice>  o 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>T</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term>Introducir un nuevo Contacto</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>Archivo</guimenu>
-		  <guisubmenu>Nuevo</guisubmenu>
-		  <guimenuitem>Contacto</guimenuitem> </menuchoice>  o 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>C</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term>Crear una nueva Tarea</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>Archivo</guimenu>
-		  <guisubmenu>Nuevo</guisubmenu>
-		  <guimenuitem>Tarea</guimenuitem>  </menuchoice> o 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>T</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	</variablelist>
-      </para>
-    </sect2> 
-    <sect2 id="quickref-mail">
-      <title>Enviar Tareas por Correo</title>
-      <para>
-        Aquí están las tareas más comunes con el correo, y los
-        atajos para manejarse por su buzón con el teclado en lugar
-        de con el ratón:
-         <variablelist>
-	  <varlistentry>
-	    <term>Comprobar Correo</term>
-	    <listitem>
-	      <para>
-                Pulse <guibutton>Obtener</guibutton> en la barra de
-                herramientas. No hay atajo de taclado para esto,
-                pero puede pedir a <application>Evolution</application>
-                que obtenga los nuevos mensajes periodicamente. Para
-                hacerlo, FIXME.
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Responder a un Mensaje</term>
-	    <listitem>
-	      <para>
-                Para responder al remitente de un mensaje tan solo debe:
-                pulsar <guibutton>Responder</guibutton> en la barra de
-                herramientas, o pulsar
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>R</keycap>
-                </keycombo>
-                </para>
-	      <para>
-                Para responder al remitente y a todos los destinatarios
-                visibles del mensaje, pulse <guibutton>Responder a
-                Todos</guibutton> o seleccione el mensaje y pulse
-                <keycombo action="simul">
-		  <keycap>Shift</keycap>
-		  <keycap>Ctrl</keycap>
-		  <keycap>R</keycap>
-                </keycombo>
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  
-          <varlistentry>
-	    <term>Reenviar un Mensaje</term>
-	    <listitem>
-	      <para>
-                Sleccione el mensaje o mensajes que quiere reenviar,
-                y pulse <guibutton>Reenviar</guibutton> en la barra de
-                herramientas, o pulse
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>J</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Abrir un Mensaje en una Nueva Ventana</term>
-	    <listitem>
-	      <para>
-                Pulse dos veces sobre el mensaje que quiere ver, o
-                seleccionelo y pulse
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>O</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Crear Filtros y Carpetas Virtuales</term>
-	    <listitem>
-	      <para>
-                Puede crear filtros y carpetas virtuales basados en las
-                caracteristicas de un mensaje específico desde el menú que
-                aparece al pulsar el botón derecho del ratón.  
-                Alternativamente, seleccion un mensaje, y elija
-                <menuchoice><guimenu>Configuración</guimenu>
-                <guimenuitem>Filtros de Correo</guimenuitem> </menuchoice>
-                o <menuchoice> <guimenu>Configuración</guimenu>
-                <guimenuitem>Editor de Carpetas Virtuales</guimenuitem>
-                </menuchoice>.  Los filtros se discuten en <xref
-                linkend="usage-mail-organize-filters">, y las carpetas
-                virtuales en <xref
-                linkend="usage-mail-organize-vfolders">.
-            </para>
-	    </listitem>
-	</varlistentry>
-	</variablelist>
-
-        </para>
-      </sect2>
-      <sect2 id="quickref-cal">
-        <title>Calendario</title>
-        <para>
-        <variablelist>
-	  <varlistentry>
-	    <term></term>
-	    <listitem>
-	      <para>
-               </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-
-        </para>
-      </sect2>
-      <sect2 id="quickref-contact">
-        <title>Administrador de Contactos</title>
-        <para>
-
-
-        <variablelist>
-	  <varlistentry>
-	    <term></term>
-	    <listitem>
-	      <para>
-               </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-
-
-        </para>
-      </sect2>
-    </sect1>
-  </preface>
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/help/es/usage-calendar.sgml b/help/es/usage-calendar.sgml
deleted file mode 100644
index 1abbace951..0000000000
--- a/help/es/usage-calendar.sgml
+++ /dev/null
@@ -1,373 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-calendar">
-  <title>El calendario de Evolution</title>
-  <para>
-    Para comenzar a usar el calendario, seleccione
-    <guibutton>Calendario</guibutton> de la <interface>barra de
-    atajos</interface>.  Por defecto, el calendario empieza mostrando el
-    horario para hoy sobre un fondo reglado.  Arriba a la derecha, hay un
-    calendario mensual que puede usar para cambiar de día.  Debajo de eso,
-    hay una <guilabel>Lista de Tareas</guilabel>, donde puede tener una
-    lista de tareas separada de sus citas del calendario.  La vista diaria
-    del calendario se muestra en <xref linkend="usage-calendar-fig">.
-
-   <!-- ============== Figure ============================= -->
-    <figure id="usage-calendar-fig">
-      <title>Vista del Calendario de Evolution</title>
-      <screenshot>
-	<screeninfo>Vista del Administrador de Contactos de Evolution</screeninfo>
-	<graphic fileref="fig/calendar" format="png" srccredit="Aaron Weber">
-	</graphic>
-      </screenshot>
-    </figure>
-  <!-- ============== End of Figure ============================= --> 
-
-  </para>
-    <sect1 id ="usage-calendar-view"> 
-    <title>Maneras de ver su calendario</title>
-
-    <para>
-      La barra de herramientas le ofrece cuatro vistas distintas de su
-      calendario: un día, cinco días, una semana, o un mes. Pulse sobre
-      los botones con forma de calendario a la derecha de la barra de
-      herramientas para alternar entre las distintas vistas. Tambien puede
-      seleccionar un rango de días&mdash; tres días, diez días, quinzenas
-      si quiere&mdash; en el pequeño calendario en la esquina superior
-      derecha.
-    </para>
-    <para>
-       Los botones <guibutton>Previo</guibutton> y <guibutton>
-       Siguiente</guibutton> le moverán hacia alante y hacia atrás en las
-       páginas de su calendario.  Si está viendo solo a un día, verá la
-       página de mañana o la de ayer.  Si esta viendo su calendario por
-       semanas, meses, quincenas, o cualquier otra cosa, se movera esa
-       cantidad de tiempo. Para volver al día de hoy, pulse
-       <guibutton>Hoy</guibutton>.
-    </para>
-    <para>
-       Para ver una fecha espefica del calendario, pulse
-       <guibutton>Ir A</guibutton> y seleccione la fecha en la ventana
-       de diálogo que aparece.
-    </para>
-
-
-<!-- ############### FIXME FIXME FIXME ############
-Caracteristica no implementada y que puede que no se implemente por falta
-de tiempo, recursos, e interes.
-    <para>
-       In addition, <application>Evolution</application> supports
-       Hebrew, Muslim, and other calendar formats.  To switch to a
-       different calendar format, choose
-       <guimenuitem>GUIMENUITEM</guimenuitem> from the
-       <guimenu>GUIMENU</guimenu>.
-    </para>
-################  END FIXME AREA   ##################   -->
-
-  </sect1>
-  <sect1 id="usage-calendar-apts">
-    <title>Programando Citas con el Calendario de Evolution</title>
-    <para>
-      Naturalmente, querra usar el calendario para hacer algo más que
-      saber que día es. Esta sección le contará como fijar eventos, poner
-      alarmas, y especificar recurrencias en los eventos.
-    </para>
-    <sect2 id="usage-calendar-apts-basic">
-      <title>Creando eventos</title>
-      <para>
-	Para crear un nuevo evento de calendario, seleccione
-        <menuchoice>
-	  <guimenu>Archivo</guimenu>
-	  <guisubmenu>Nuevo</guisubmenu> 
-	  <guimenuitem>Cita</guimenuitem>
-	</menuchoice>
-	o pulse el botón <guibutton>Nuevo</guibutton> a la izquierda de la barra
-	de herramientas. El diálogo de <interface>Nueva Cita</interface>
-	aparecerá con la habitual barra de menú, barra de herramientas, y ventana
-	llenas de opciones.
-      </para>
-      <tip id="new-appointment-shortcut">
-        <title>Atajo</title>
-        <para>
-           Si no necesita poner más información que la fecha y la hora de
-           la cita, puede pichar simplemente en cualquier espacio en blanco
-           del calendario y comenzar a escribir. Puede incluir otra
-           información más tarde con el editor de citas.
-        </para>
-      </tip>
-
-      <para>
-        Su evento debe tener una fecha de inicio y de fin &mdash; por
-        defecto, hoy &mdash; pero puede elegir entre darle una hora de
-        inicio y de fin o marcarlo como un <guilabel>Evento de todo
-        el día</guilabel>. Un <guilabel>Evento de todo el día</guilabel>
-        aparece arriba en una lista de eventos diarios en lugar de dentro
-        del día.  Eso hace que sea más facil tener eventos que se solapen y
-        que esten unos dentro de otros.  Por ejemplo, una conferencia puede
-        ser un evento de todo el día, y los encuentros en la conferencia
-        serian eventos parciales.  Naturalmente, los eventos con horarios
-        específicos de inicio y fin tambien pueden solaparse.  Cuenado lo
-        hacen son mostrados como multiples columnas en la vista diaria del
-        calendario.
-      </para>
-      <note>
-       <title>Haciendo Dos Cosas A La Vez</title>
-         <para>
-           Si crea eventos de calendario que se superponen,
-           <application>Evolution</application> los mostrará uno al lado del
-           otro en su calendario.  Eso si,
-           <application>Evolution</application> no puede ayudarle ha hacer
-           varias cosas al mismo tiempo.
-         </para>
-      </note>
-      <para>
-         Puede tener hasta cuatro <guilabel>Alarmas</guilabel>
-         distintas, para cualquier momento antes de la hora que ha fijado
-         para el evento.  Puede tener una alarma de cada tipo:
-         <variablelist>
-           <varlistentry>
-	    <term><guilabel>Mostrar</guilabel></term>
-	    <listitem>
-	      <para>
-	        Aparecerá una ventana en la pantalla para recordarle el evento.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term><guilabel>Auditiva</guilabel></term>
-	    <listitem>
-	      <para>
-	        Eliga esta opción para que el ordenador emita una alarma
-	        auditiva.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Programa</guilabel></term>
-	    <listitem>
-	      <para>
-	        Seleccione esto si quiere que alguna aplicación adicional se
-	        ejecute como recordatorio.  Puede escribir su nombre en el campo
-	        de texto, o buscarla con el botón
-	        <guibutton>Buscar</guibutton>.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Correo</guilabel></term>
-	    <listitem>
-	      <para>
-	        <application>Evolution</application> enviará un mensaje
-	        recordatorio a la dirección que haya escrito en el campo de
-	        texto.
-             </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	    
-      </para>
-      <para>
-         <guilabel>Clasificación</guilabel> es un poco más complicado,
-         y solo afecta a los calendarios en red.
-         <guilabel>Público</guilabel> es la categoría por defecto,
-         y un evento público puede ser visto por cualquiera en la red de
-         conpartición del calendario.  <guilabel>Privado</guilabel> indica
-         un nivel de seguridad, y <guilabel>Confidencial</guilabel> un
-         nivel mayor.  <!-- FIXME --> El significado y la implementecion de          estas caracteristicas
-         todavia no se han determinado. <!-- FIXME -->
-      </para>
-      <para>
-        La pestaña <guilabel>Recurrencia</guilabel> le permite describir
-        repeticiones en eventos que van desde una vez cada día a una vez
-        cada 100 años.  Puede tambien elegir cuando cesarán las
-        repeticiones, y, bajo <guilabel>Excepciones</guilabel>, elegir
-        días individuales en los que el evento <emphasis>no</emphasis> se
-        realizará. Haga sus selecciones de izquierda a derecha, y formará
-        una frase: "Cada dos semanas los lunes y los viernes hasta el 3 de
-        enero de 2003" o "Cada mes el primer viernes durante 12
-        ocurrencias".
-      </para>
-
-      <para>
-	Una vez que haya acabado con toda la configuración, pulse en el icono
-	del disco en la barra de herramientas.  Esto guardará el evento y cerrará
-	la ventana de edición de eventos. Si quiere, puede alterar el resumen del
-	en la vista del calendario pulsando sobre ela y escribiendo. Puede
-	cambiar otros valores pulsando con el botón derecho del ratón sobre el
-	evento y eligiendo <guimenuitem>Editar esta cita</guimenuitem>.
-      </para>
-    </sect2>
-
-<!-- ############UNIMPLEMENTED FEATURES ###################
-  ################## NO LO VOY A TRADUCIR PORQUE NO SE MUESTRA ######
-
-    <sect2 id="usage-calendar-apts-group">
-      <title>Appointments for Groups</title>
-      <para>
-	If you have your calendar set up to work with other
-	calendars over a network, you can see when others are
-	available to meet with you. 
-      </para>
-      <note>
-	<title>Unimplemented Feature</title>
-	<para>This feature is not yet implemented.</para>
-      </note>
-
-      <para>
-	In addition, you can use <application>Evolution</application>
-	to mark a meeting request on another person's calendar.  To do
-	it, click <guibutton>New</guibutton> in the calendar toolbar,
-	or select <menuchoice> <guimenu>File</guimenu>
-	<guisubmenu>New</guisubmenu>
-	<guimenuitem>Appointment</guimenuitem> </menuchoice> to bring
-	up the <interface>new event</interface> window.  Then describe
-	the event as you would any other.  Before you click
-	<guibutton>OK</guibutton>, (INSERT DESCRIPTION HERE...).
-	<application>Evolution</application> will automatically send
-	email to each person on the request list, notifying of the
-	time and date of the meeting you have requested with them.  In
-	addition, it will mark the event on your calendar and on
-	theirs as tentative, rather than a confirmed, event.
-      </para>
-      <para>
-	To mark a tentative event as confirmed, click once on the
-	event in the <interface>calendar view</interface> to select
-	it, and then choose <guimenuitem>Event
-	Properties</guimenuitem> from the <guimenu>Settings</guimenu>
-	menu.  In the <interface>Event Properties</interface> dialog
-	window, click the "tentative" button to De-select the
-	event.
-      </para>
-    </sect2>
-
-
-    <sect2 id="usage-calendar-apts-privs">
-      <title>Scheduling privileges</title>
-      <para>
-	There are several levels of scheduling privileges.  You
-	can set whether people can see your calendar, whether they
-	can request meetings or appointments, and whether they can
-	create appointments.  This section may have to be deleted,
-	because I don't know if we are going to support privileges
-	at all.
-      </para>
-    </sect2>
- ########## END UNIMPLEMENTED FEATURESET ############ -->
-
-  </sect1>
-
-  <sect1 id="usage-calendar-todo">
-   <title>La lista de tareas</title>
-    <para>
-       La lista de tareas, situada en la esquina inferior derecha del
-       calendario, le permite mantener una lista de tareas separada de sus
-       eventos de calendario.  Las tareas son coloreadas y ordenadas por
-       prioridad y fecha de vencimiento (vea <xref linkend="config-prefs">
-       para más inforación), y son incluidas con la información del
-       calendario cuando se sincroniza con dispositivo de mano.  Puede usar
-       la lista en un formato más grande eligiendo el botón
-       <guibutton>Tareas</guibutton> de la barra de atajos o del arbol de
-       carpetas.
-    </para>
-    <para>
-       Para guardar una nueva tarea, pulse sobre el botón
-       <guibutton>Añadir</guibutton>.  <application>Evolution</application>
-       mostrará una pequeña ventana con cinco elementos en ella:
-     
-        <variablelist>
-	  <varlistentry>
-	  <term> <guilabel>Resumen:</guilabel></term>
-	  <listitem>
-            <para>
-              La descripción que escriba aquí aparecerá en la lista Por
-              Hacer.
-          </para>
-	  </listitem>
-	  </varlistentry>
-	
-	<varlistentry>
-	  <term> <guilabel>Fecha de Plazo:</guilabel></term>
-	  <listitem>
-	    <para>
-            Decida cuando vence el plazo para este elemnto.
-            Puede escribir una fecha y una hora, o seleccionar una del
-            <guibutton>Calendario</guibutton> y la hora de los menus desplegables.
-          </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Prioridad:</guilabel></term>
-	  <listitem>
-	    <para>
-             Seleccione un nivel de importancia desde 1 (más importante) a 9
-              (menos importante).
-            </para>
-	  </listitem> 
-	</varlistentry>
-	<varlistentry>
-	  <term> <guilabel>Comentarios sobre el elemento:</guilabel></term>
-	  <listitem>
-	    <para>
-              Si lo desea, puede escribir aquí una descripción más detallada
-              del elemento.
-            </para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-    </para>
-   <para>
-     Una vez que ha añadido una tarea a su lista "por hacer", su resumen
-     aparece en la sección <guilabel>Resumen</guilabel> de la lista de
-     tareas. Para ver o editar una descripción detallada en un
-     elemento, pulse dos veces sobre el, o seleccionelo y pulse
-     <guibutton>Editar</guibutton>.  Puede borrar un elemento
-     seleccionandolo y pulsandolo en el botón <guibutton>Borrar</guibutton>.
-   </para>
-  </sect1>
-
-  <sect1 id="usage-calendar-multiple">
-    <title>Múltiples Calendarios</title>
-    <para>
-       <application>Evolution</application> le permite tener y mantener
-       múltiples calendarios.  Esto es útil si mantiene horarios para otras
-       personas, si es el responsable de la búsqueda de recursos o
-       habitaciones, o si tiene múltiples personalidades.
-    </para>
-   
-    <example>
-      <title>Manteniendo Múltiples Calendarios</title>
-      <para>
-        Keelyn, la encargada de oficina de una pequeña compañía, tiene
-        un calendario para su propio horario.  En la red local, mantiene
-        uno para la sala de reuniones, para que la gente sepa cuando pueden
-        concertar citas.  Ademas de eso, mantiene un calendario que refleja
-        cuando van a estar disponibles los consultores, y otro donde
-        sigue los días en los que juegan los Red Sox.
-      </para>
-    </example>
-    <para>
-      Para crear un nuevo calendario, seleccione
-      <menuchoice>
-	<guimenu>Archivo</guimenu> <guisubmenu>Nuevo</guisubmenu>
-	<guimenuitem>Calendario</guimenuitem>
-      </menuchoice>.
-       Puede colocar el calendario en cualquier carpeta de calendario y
-       acceder a el desde la vista de carpetas.  Las alarmas, la
-       configuración, y las vistas de cada calendario se mantienen separadas
-       unas de otras.
-    </para>
-    
-  </sect1>
-</chapter>
-
-
-
-
-
-
-
-
-
-
diff --git a/help/es/usage-contact.sgml b/help/es/usage-contact.sgml
deleted file mode 100644
index c419b2e6b1..0000000000
--- a/help/es/usage-contact.sgml
+++ /dev/null
@@ -1,619 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-contact">
-  <title>La Agenda de Direcciones de Evolution</title>
-  <abstract>
-    <para>
-      The <application>Evolution</application> address book can
-      handle all of the functions of an address book, phone book, or
-      Rolodex.  Of course, it's a lot easier to update
-      <application>Evolution</application> than it is to change an
-      actual paper book. <application>Evolution</application> also
-      allows easy synchronization with hand-held devices.  Since
-      <application>Evolution</application> supports the <glossterm
-      linkend="ldap">LDAP</glossterm> directory protocol, you can use
-      it with almost any type of existing directory server on your
-      network.
-    </para>
-    <para>
-      Another advantage of the <application>Evolution</application>
-      address book is its integration with the rest of the
-      application.  When you look for someone's address, you can also
-      see a history of appointments with that person.  Or, you can
-      create address cards from emails with just a few clicks.  In
-      addition, searches and folders work in the same way they do in
-      the rest of Evolution.
-    </para>
-    <para>
-      This chapter will show you how to use the
-      <application>Evolution</application> address book to organize
-      any amount of contact information, share addresses over a
-      network, and several ways to save time with everyday tasks. To
-      learn about configuring the address book, see <xref
-      linkend="config-prefs-contact">.
-    </para>
-  </abstract>
-  <sect1 id="usage-contact-basic">
-    <title>Empezando con la Agenda de Direcciones</title>	
-    
-    <para>
-       To open up your address book, click on
-       <guibutton>Contacts</guibutton> in the shortcut bar, or select
-       one of your contacts folders from the folder bar.  <xref
-       linkend="usage-contact-fig"> shows the address book in all
-       its organizational glory.  By default, the address book
-       shows all your cards in alphabetical order, in a <glossterm
-       linkend="minicard">minicard</glossterm> format.  You can select
-       other views from the <guimenu>View</guimenu> menu, and adjust
-       the width of the columns by clicking and dragging the grey
-       column dividers.
-    </para>
-
-
-    <figure id="usage-contact-fig">
-      <title>Agenda de Direcciones de Evolution</title>
-      <screenshot>
-	<screeninfo>Evolution Address Book Window</screeninfo>
-	<graphic fileref="fig/contact" format="png" srccredit="Aaron Weber">
-	    </graphic>
-      </screenshot>
-    </figure>
-
-    <para>
-       The toolbar for the address book is quite simple:
-       <itemizedlist>
-	<listitem><para>
-           <guibutton>New</guibutton> creates a new card.
-	</para></listitem>
-
-	<listitem><para>
-           <guibutton>Find</guibutton> brings up an in-depth search window.
-         </para></listitem>
-	
-	<listitem><para>
-	    <guibutton>Print</guibutton> sends one or more of your cards to the printer.
-	</para></listitem>
-        <listitem><para>
-           <guibutton>Delete</guibutton> deletes a selected card.
-        </para></listitem>
-
-        <listitem><para> <guibutton>View All</guibutton> displays all
-           the address information in the folder.  Use this button to
-           refresh the display for a network folder, or to switch from
-           viewing the results of a search and see the whole contents.
-           </para></listitem>
-
-        <listitem><para> <guibutton>Stop</guibutton> stops loading
-           contact data from the network.  This button is only
-           relevant if you are looking at contact information on a
-           network.  </para></listitem>
-      </itemizedlist>
-    </para>
-
-    <para>
-       Your contact information fills the rest of the display.  Move
-       through the cards alphabetically with the buttons and the
-       scrollbar at the right of the window. Of course, if you have
-       more than a few people listed, you'll want some way of finding
-       them more quickly, which is why there's a search feature.
-    </para>
-
-    <sect2 id="contact-search">
-      <title>Buscando Contactos</title>
-      <para>
-	   Entre <guilabel>Borrar</guilabel> y <guilabel>Ver
-    	   Todo</guilabel> hay un campo de búsqueda rápida. Para usarlo,
-    	   elija de la lista descendente que clase de búsqueda quiere hacer
-    	   (toda la tarjeta, solo el nombre, o solo la dirección de correo),
-    	   entonces escriba una o más palabras en la caja de entrada de texto,
-    	   y pulse <keycap>Enter</keycap>.
-    	   <application>Evolution</application> buscará en los contenidos
-    	   de todas las tarjetas mostradas para encontrar una que concuerde.
-    	   Puede refinar las búsquedas haciendo varias búsquedas sucesivas,
-    	   o empezar de nuevo pulsando el botón <guibutton>Ver
-    	   Todas</guibutton>.
-	</para>
-      <para>
-	   Si no hay coincidencias, la tarjeta mostrada estará en blanco.
-	   Cuando quiera volver a ver todas las tarjetas de nuevo, pulse
-	   <guilabel>Mostrar Todas</guilabel>.
-       </para>
-      <example id="contact-quicksearch-ex">
-	<title>Refinando una Búsqueda Rápida</title>
-	<para>
-	    Tom vuelve de almorzar y se encuantra una nota en su teclado:
-	    "Le ha llamado Curtis de ventas, pero no dejo un teléfono,
-	    y se me olvidó anotar la compañía para la que trabaja. Eso si, dijo
-	    que era importante."
-	    Tom no está molesto en absoluto.
-         </para>
-	 <para>
-	    Abre la carpeta de contactos, y realiza una busqueda rápida por
-	    "Curtis". Hay dieciocho personas diferentes con ese nombre en el
-	    archivo. Entonces escribe "Ventas", y
-	    <application>Evolution</application> lo reduce al Curtis correcto.
-	    Tan solo se siente molesto cuando descubre que la llamada no era
-	    realmente importante.
-          </para>
-      </example>
-    
-      <para>
-        Si prefiere realizar una búsqueda más compleja, pulse
-        <guibutton>Buscar</guibutton> o elija
-        <menuchoice><guimenu>Herramientas</guimenu><guimenuitem>Buscar
-        Contacto</guimenuitem></menuchoice>. Esto abrirá la ventana de
-        búsqueda a fondo, que le permitirá usar multiples criterios de
-        búsqueda de la misma manera que en los filtros de correo y las
-        <glossterm linkend="vfolder">carpetas virtuales</glossterm>.
-        </para>
-      <para>
-        Pulse <guibutton>Añadir Criterio</guibutton> para aumentar el
-        número de criterios que quiere usar en la búsqueda, y
-        <guibutton>Eliminar Criterio</guibutton> para eliminar uno del la
-        parte inferior de la lista.  Su criterio puede ser una búsqueda en
-        los campos <guilabel>Nombre</guilabel> o
-        <guilabel>Correo</guilabel>. Alternativamente puede elegir buscar en
-        todos los campos con una expresión regular.  Entonces, puede
-        seleccionar entre los requisistos <guilabel>Comienza con</guilabel>
-        y <guilabel>No contiene</guilabel>, decidir si deben conincidir
-        <guilabel>Todos</guilabel> o <guilabel>Alguno</guilabel> de sus
-        criterios, y pulsar <guibutton>Buscar</guibutton> para ejecutar
-        todo.
-      </para>
-    
-    </sect2>
-
-  </sect1>
-  <sect1 id="usage-contact-cards">
-    <title>Destruir, Crear, y Cambiar: El Editor de Contactos</title>
-    <para>
-       To delete a card, click on it once to select it, then press the
-       <guibutton>Delete</guibutton> button.  If you have multiple
-       cards selected, you'll delete multiple cards.
-    </para>
-    <para>
-       Si quiere añadir o cambiar tarjetas, usará el editor de contactos.
-       Para cambiar una tarjeta que ya existe, pulse dos veces sobre ella
-       para abrir la ventana del editor de contactos con toda la información
-       actual.  Si quiere crear una nueva, pulsando el botón
-       <guibutton>Nuevo</guibutton> el la barra de herramientas abrirá la
-       misma ventana, con los campos en blanco para que los rellene.
-    </para>
-
-      <para>
-	La ventana del editor de contactos tiene dos pestañas,
-    	<guilabel>General</guilabel>, para información contacto básica,
-    	y <guilabel>Detalles</guilabel>, para una descripción más específica
-    	de la persona.  Ademas, contiene un menú
-    	<guimenu>Archivo</guimenu>, (ver <xref
-    	linkend="menuref-contact-editor">) y una barra de herramientas con
-    	tres elementos: <guilabel>Guardar y Cerrar</guilabel>,
-    	<guilabel>Imprimir</guilabel>, y <guilabel>Borrar</guilabel>.
-      </para>
-      
-      <figure id="usage-contact-editor-fig">
-	  <title>Editor de contactos de Evolution</title>
-	  <screenshot>
-	    <screeninfo>Evolution Contact Editor</screeninfo>
-	  <graphic fileref="fig/contact-editor.png" format="png" srccredit="Aaron Weber">
-		</graphic>
-	</screenshot>
-      </figure>
-      
-      <para> La pestaña <guilabel>General</guilabel> tiene siete secciones,
-         cada una con un icono, una cara, para el nombre y la compañía, un
-         teléfono para números de teléfono, un sobre para direcciones de
-         correo, un globo terraqueo para direcciones de páginas web, una
-         casa para dirección postal, un archivador para contactos, y una
-         cartera para categorías. 
-    </para>
-    <para>
-     <variablelist>
-
-	<varlistentry>
-	  <term>Full Name</term>
-	  <listitem>
-	    <para>
-              The <guilabel>Full Name</guilabel> field has two
-              major features:
-              <itemizedlist>
-		<listitem>
-		  <para>
-                    You can enter a name into the <guibutton>Full
-                    Name</guibutton> field, but you can also click the
-                    <guibutton>Full Name</guibutton> button to bring
-                    up a small dialog box with a few text boxes
-                    <variablelist>
-		      <varlistentry>
-			<term><guilabel>Title: </guilabel></term>
-			<listitem> <para>
-	                  Enter an honorific or select one from the menu.
-	                </para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>First: </guilabel></term>
-			<listitem> <para>
-		            Enter the first, or given, name.
-			 </para></listitem> 
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Middle: </guilabel></term>
-			<listitem> <para>
-			  Enter the middle name or initial, if any.
-			</para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Last: </guilabel></term>
-			<listitem> <para>
-			   Enter the last name (surname).
-			 </para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Suffix: </guilabel></term>
-			<listitem> <para>
-			   Enter suffixes such as "Jr." or "III."
-			</para></listitem>
-		      </varlistentry>
-		    </variablelist>
-                   </para>
-		</listitem>
-	        <listitem>
-		  <para>
-                    The <guilabel>Full Name</guilabel> field also
-                    interacts with the <guilabel>File As</guilabel>
-                    box to help you organize your contacts.
-                  </para>
-                  <para>
-                    To see how it works, type a name in the
-                    <guilabel>Full Name</guilabel> field:
-                    <userinput>Rupert T. Monkey</userinput>.  You'll
-                    notice that the <guilabel>File As</guilabel> field
-                    also fills up, but in reverse:
-                    <computeroutput>Monkey, Rupert</computeroutput>.
-                    You can pick <computeroutput>Rupert Monkey
-                    </computeroutput> from the drop-down, or type in
-                    your own, such as <userinput> T. Rupert Monkey
-                    </userinput>.
-                 </para>
-		  <tip>
-		    <title>Filing Suggestion</title>
-		   
-		    <para>
-                      Don't enter something entirely different from
-                      the actual name, since you might forget that
-                      you've filed Rupert's information under "F" for
-                      "Fictitious Ximian Employee."
-                    </para>
-		  </tip>
-		</listitem>
-	      </itemizedlist>
-             </para>
-           </listitem>
-	</varlistentry>
-	<varlistentry>
-            <term>Multiple Values for Fields</term>
-            <listitem>
-	      <para>
-                If you click on the small arrow buttons next to the
-                <guilabel>Primary Email</guilabel> field, you can also
-                choose <guilabel>Email 2</guilabel> and
-                <guilabel>Email 3</guilabel>.  Although the contact
-                editor will only display one of those at any given
-                time, <application>Evolution</application> will
-                store them all.  The arrow buttons next to the
-                telephone and postal address fields work in the same
-                way.
-              </para>
-          </listitem>
-	</varlistentry>
-      </variablelist>
-     </para>
-     <para>
-      El último elemento en la pestaña <guilabel>General</guilabel> es la
-       herramienta de organización de <guilabel>Categorias</guilabel>, para
-       ver información acerca de ella, lea <xref
-       linkend="usage-contact-organize">.
-     </para>
-     <para>
-       La pestaña de <guilabel>Detalles</guilabel> es, afortunadamente,
-       mucho más simple: tres secciones, las cuales son más o menos obvias:
-       la cartera al lado de los detalles acerca de la vida profesional del
-       contacto, la cara al lado de los detalles de su vida personal,
-       el globo terraqueo al lado de un gran espacio en blanco que puede
-       usar para cualquier cosa que quiera anotar.
-       Si alguna vez quiso tener ese poder sobrenatural de recordar oscuros
-       detalles como la fecha del aniversario de alguien (quiza del suyo
-       propio) esta es la manera de desarrollarlo.
-     </para>
-
-
-
-
-<!--- ############# This section isn't implemented yet either:
-    <sect2>
-      <title></title>
-      <para>
-        <tip>
-	  <title>Contact Shortcuts</title>
-	  <para>
-            You can add cards from within an email message or calendar
-            appointment.  While looking at an email, right-click on
-            any email address or message, and choose
-            <guimenuitem>Create Card for this Address</guimenuitem> or
-            <guimenuitem>Create Card for this Sender</guimenuitem>
-            from the menu.  While looking at a calendar appointment,
-            right-click any email address, and choose
-            <guimenuitem>Create Card for this Address</guimenuitem>.
-            (NOTE that feature may change!  unimplemented!)
-          </para>
-	</tip>
-      </para>
-      <para>
-        You can move cards around just as you would move email
-        messages: dragging and dropping works, as does right-clicking
-        and choosing <guimenuitem>Move</guimenuitem> from the menu
-        that appears.
-      </para>
-    </sect2>
-############### SHORTCUT SECTION COMMENTED OUT FOR NOW -->
-
-  </sect1>
-
-  <sect1 id="usage-contact-organize">
-    <title>Organizando su Agenda de Direcciones</title>
-    <para>
-       Organizing your address book is a lot like organizing your
-       mail.  You can have folders and searches the same way you can
-       with mail, but the address book does not allow vFolders.  It
-       does, however, allow each card to fall under several
-       categories, and allow you to create your own categories.  To
-       learn about categories, read <xref
-       linkend="usage-contact-organize-group-category">.
-    </para>
-
-<!--
-    <para>
-      Another useful <application>Evolution</application> feature is
-      its ability to recognize when people live or work together.  If
-      several people in your address book share an address, and you
-      change the address for one of them,
-      <application>Evolution</application> will ask you if you wish to
-      change the address for all of them, or just for one.
-    </para>
--->
-
-    <sect2 id="usage-contact-organize-group">
-      <title>Grupos de contactos</title>
-      <para>
-         <application>Evolution</application> le ofrece dos maneras de
-         organizar sus tarjetas.  La primera es usando carpetas.
-         Esto funciona igual que las carpetas de correo.  Para más
-         flexibilidad, puede marcar los contactos como miembros de
-         diferentes categorías.
-      </para>
-
-      <sect3 id="usage-contact-organize-group-folder">
-	<title>Agrupando con Carpatas</title>
-	<para>
-	   La manera más sencilla de agrupar tarjetas de direcciones es usar
-	   carpetas.  Por defecto, las tarjetas están en la carpeta
-	   <guilabel>Contactos</guilabel>.  Si ha leido <xref
-	   linkend="usage-mainwindow"> entonces sabrá que puede crear una nueva
-	   carpeta seleccionando 
-           <menuchoice>
-           <guimenu>Archivo</guimenu>
-	   <guisubmenu>Nuevo</guisubmenu>
-	   <guimenuitem>Carpeta</guimenuitem>
-           </menuchoice>
-           y que puede poner nuevas carpetas en cualquier sitio que quiera.
-	   Exactamente como con el correo, las tarjetas deben estar en una carpeta
-	   de tarjetas, y ninguna tarjeta puede estar en dos sitios a la vez.  Si
-	   quiere más flexibilidad, pruebe <xref
-	   linkend="usage-contact-organize-group-category">.
-	 </para>
-	<para>
-          Para poner una tarjeta en una carpeta, simplemente arrastrela allí
-          desde la vista de carpetas.  Recuerde que las tarjetas de
-          contactos solo pueden estar en carpetas de contactos, como el
-          correo solo puede estar en carpetas de correo, y los calendarios
-          en carpetas de calendarios.
-         </para>
-      </sect3>
-      
-      <sect3 id="usage-contact-organize-group-category">
-	<title>Agrupando con Categorías</title>
-	<para>
-           La otra manera de agrupar tarjetas es marcarlas como
-           pertenecientes a distintas categorias.  La diferencia entre
-           carpetas y categorias es que las carpetas contienen las tarjetas,
-           pero pertenecer a una categoría es una propiedad de cada tarjeta.
-           Lo que significa que puede marcar una tarjeta como perteneciente
-           a varias categorias o a ninguna.  Por ejemplo, yo pongo la
-           tarjeta de mi amigo Matthew en la categoría "Negocios", porque
-           trabaja conmigo, en la categoría "Amigos", porque tambien es mi
-           amigo, y en la categoría "Frecuente", porque le llamo
-           continuamente y nunca me acuerdo de su número de teléfono.
-        </para>
-	<para>
-           Para marcar una tarjeta como perteneciente a una categoría, pulse
-           botón <guibutton>Categorias</guibutton> abajo a la derecha.
-           De la ventana de diálogo que aparece, puede marcar tantas
-           categorías como quiera.
-        </para>
-	<para>
-           Entonces, puede referirse a todas las tarjetas en esa categoría
-           haciendo: <!-- ARREGLAME --> Esperando a que Evolution soporte
-           la operación.
-         </para>
-
-       <!-- ARREGLAME: Caracteristica no implementeada
-	<para>
-
-           Si la lista principal de categorías no le es suficiente, puede
-           añadir las suyas propias.  Simplemente escriba el nombre de la
-           nueva categoría en la caja de texto, entonces pulse
-           <guibutton>Categorias</guibutton> y elija
-           <guilabel>Añadir a la Lista Principal</guilabel> en la ventana
-           aparece. 
-         </para>
-       -->
-
-      </sect3>
-    </sect2>
-  </sect1>
-  
-  <sect1 id="usage-contact-sharing">
-    <title>Compartiendo sus Tarjetas</title>
-    <para>
-       Si tiene sus tarjetas en una red usando un servidor <glossterm
-       linkend="ldap">LDAP</glossterm>, puede compartir el acceso a ellas,
-       ver otras agendas, o mantener información de contacto compartida
-       para su compañía o su departamento.  Esta es la clase de
-       características que querrá si su compañía tiene una lista de
-       vendedores y clientes que necesita ser actualizada constantemente.
-       Si se comparten calendarios al igual que agendas, la gente puede
-       evitar duplicar trabajo y mantenerse al día en los desarrollos de su
-       grupo de trabajo o de la compañía entera.
-    </para>
-
-     <example id="usage-contact-sharing-ex">
-	<title>Conpartiendo Tarjetas de Direcciones y Datos del Calendario</title>
-	  <para>
-	    Raul quiere concertar una reunión con la Compañía X, así que
-	    busca en la red la tarjeta de la Compañía X para saber a quien tiene
-	    que llamar.  Dado que su compañia comparte un calendario, ve que su
-	    compañera Diana ya ha concertado una reunión con la Compañía X para el
-	    próximo jueves.  Puede ir el mismo a la reunión o pedir a Diana que
-	    trate el tema por el.  De cualquier modo, evita concertar otra cita
-	    co la Compañía X. 
-	 </para>
-      </example>
-    <para>
-       Of course, you don't want to share all of your cards&mdash; why
-       overload the network with a list of babysitters or tell
-       everyone in the office you're talking to new job prospects?  If
-       you keep cards on your own computer, you can decide which items
-       you want to make accessible to others.
-    </para>
-    <para>
-       To learn how to add a remote directory to your available
-       contact folders, see <xref linkend="config-prefs-contact">.
-       Once you have a connection, the network contacts folder or
-       folders will appear inside the <guilabel>External
-       Directories</guilabel> folder in the folder bar.  It will work
-       exactly like a local folder of cards, with the following
-       exceptions:
-       <itemizedlist>
-
-          <listitem>
-	  <para>
-              Network folders are only available when you are
-              connected to the network.  If you use a laptop or have a
-              modem connection, you may wish to copy or cache the
-              network directory and then synchronize your copy with
-              the networked version periodically.  <!-- FIXME: HOW? -->
-	  </para>
-	  </listitem>
-
-          <listitem>
-	  <para>
-              To prevent excess network traffic,
-              <application>Evolution</application> will not normally
-              load the contents of LDAP folders immediately upon
-              opening.  You must click <guilabel>Display
-              All</guilabel> before LDAP folder cards will be loaded
-              from the network. You can change this behavior in the
-              <interface>Contact Preferences</interface> window.
-          </para>
-	  </listitem>
-	  <listitem>
-	  <para>
-              Your ability to view, change, add, and delete contacts
-              depends on the settings of the LDAP server. 
-          </para>
-	  </listitem>
-       </itemizedlist>
-     </para>
-  </sect1>
-
-  <sect1 id="usage-contact-automate">
-    <title>Herramientas de la Agenda de Direcciones</title>
-    <para>
-       The address book works closely with
-       <application>Evolution</application>'s mail and calendar tools.
-       For example, you can use the address book to help you manage
-       mailing lists, and send or recieve address cards over email.
-       More tools are on the way, and when they arrive, <!-- FIXME -->
-       they will be described in this section.
-    </para>
-
-    <sect2 id="contact-automation-basic">
-      <title>Envíame una Tarjeta: Añadiendo Tarjetas Rápidamente</title>
-      <para>
-	Como se ha visto antes, cuando obtiene información acerca de una
-	persona en el correo o en una entrada del calendario, puede añadirla
-	a una tarjeta de direcciones.  Para hacerlo, pulse con el botón
-	derecho en cualquier dirección de correo o mensaje de correo, y
-	seleccione <guimenuitem>Añadir Tarjeta de Direcciones</guimenuitem>
-	del menú que aparece.  Naturalmente,
-	<application>Evolution</application> tambien añade tarjetas desde un
-	dispositivo de mano durante la operación de sincronización.  Para más
-	información acerca de eso, vea <xref linkend="usage-sync">.
-      </para>
-    </sect2>
-
-    <sect2 id="contact-automation-lists">
-      <title>Administrando una Lista de Correo</title>
-      <para>
-	 Ya sabe que cuando escribe un mensaje, puede dirigirlo a una o más
-	 personas, y que <application>Evolution</application> rellenará las
-	 direcciones con las direcciones de las tarjetas de su agenda si le
-	 deja.  Ademas, si quiere puede enviar mensajes a todos los de un
-	 grupo en particular.
-      </para>
-
-<!-- FIXME this feature not yet implemented 
-
-      <para>
-         You can also use the address book to print postal addresses
-	 on mailing labels.  Future versions of
-	 <application>Evolution</application> will allow you to you
-	 export a group of cards to a spreadsheet, database, or word
-	 processor so you can print address labels or prepare large
-	 mailings.
-      </para>
- -->
-
-    </sect2>
-<!---  FIXME this feature not yet implemented 
-    <sect2 id="usage-contact-automation-extra">
-      <title>Map It!</title>
-      <para>
-	 Need a map or directions? Click
-	 <guibutton>MapIt</guibutton> from within the contact
-	 manager, and <application>Evolution</application> will
-	 map the address for you online.
-      </para>
-    </sect2>
--->
-
-
-  </sect1>
-
-</chapter> 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/help/es/usage-mail.sgml b/help/es/usage-mail.sgml
deleted file mode 100644
index e1e02327fc..0000000000
--- a/help/es/usage-mail.sgml
+++ /dev/null
@@ -1,1526 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-mail"> 
-  <title>Correo en Evolution</title>
-  <abstract>
-    <title> Una Vista General del Correo en Evolution</title>
-    <para>
-       <application>Evolution</application> email is like other email
-       programs in all the ways you would hope:
-     <itemizedlist>
-       <listitem>
-	 <para>
-	   It can sort and organize your mail in a wide variety of ways with
-	   folders, searches, and filters.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	  It can send and receive mail in HTML or as plain text, and
-	  permits multiple file attachments.
-	 </para>
-       </listitem>
-       <listitem>
-	 <para>
-	   It supports multiple mail sources, including <glossterm
-	   linkend="imap">IMAP</glossterm>, <glossterm
-	   linkend="pop">POP3</glossterm>, local
-	   <systemitem><filename>mbox</filename></systemitem> and
-	   <systemitem><filename>mh</filename></systemitem> files, and
-	   even NNTP messages (newsgroups), which aren't technically
-	   email.
-	 </para>
-       </listitem>
-     </itemizedlist>
-    </para>
-    <para>
-      However, <application>Evolution</application> has some important
-      differences.  First, it's built to handle very large amounts of
-      mail without slowing down or crashing.  Both the <link
-      linkend="usage-mail-organize-filters">filtering</link> and <link
-      linkend="usage-mail-organize-search">searching</link> functions
-      were built for speed and efficiency on gargantuan volumes of
-      mail. There's also the <application>Evolution</application>
-      <link linkend="usage-mail-organize-vFolders">Virtual
-      Folder</link>, an advanced organizational feature not found in
-      other mail clients.  If you get a lot of mail, or if you keep
-      every message you get in case you need to refer to it later,
-      you'll find this feature especially useful.
-    </para>
-  </abstract>
-
-  <sect1 id="usage-mail-getnsend">
-    <title>Leyendo, Obteniendo y Enviando Correo</title>
-
-    <sect2 id="usage-mail-getnsend-read">
-      <title>Leyendo el Correo</title>
-      <para>
-       You can start reading email by clicking
-       <guibutton>Inbox</guibutton> in the shortcut bar. The first
-       time you use <application>Evolution</application>, it will
-       start with the <interface>Inbox</interface> open and show you a
-       message from Ximian welcoming you to the application.
-      </para>
-      <para>
-	Your <application>Evolution</application>
-	<guilabel>Inbox</guilabel> will look something like the one in
-	<xref linkend="usage-mail-intro-fig">. Just below the toolbar
-	is the <interface>message list</interface>, showing message
-	header information like <guilabel>Subject</guilabel> and
-	<guilabel>Date</guilabel>.  The message itself appears below
-	that, in the <interface>view pane</interface>.  If you find
-	the <interface>view pane</interface> too small, you can resize
-	the pane, enlarge the whole window, or double-click on the
-	message in the <interface>message list</interface> to have it
-	open in a new window.  Just like with folders, you can
-	right-click on messages in the message list and get a menu of
-	possible actions.
-     </para>
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="usage-mail-intro-fig">
-	  <title>Correo de Evolution</title>
-	  <screenshot>
-	    <screeninfo>Inbox</screeninfo>
-	    <graphic fileref="fig/mail-pic" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-      <para>
-         Most of the mail-related actions you'll want to perform are
-         listed in the <guimenu>Message</guimenu> menu in the menu
-         bar.  The most frequently used ones, like
-         <guimenuitem>Reply</guimenuitem> and
-         <guimenuitem>Forward</guimenuitem>, also appear as buttons in
-         the toolbar, and almost all of them are duplicated in the
-         right-click menu and as keyboard shortcuts, which tend to be
-         faster once you get the hang of them.  You can choose
-         whichever way you like best; the idea is that the software
-         should work the way you want, rather than making you work the
-         way the it does.
-	 <tip id="view-headers">
-	 <title>Take a look at the headers</title>
-	 <para>
-	 To look at the entire source of your email message, including
-	 all the header information, select
-	 <menuchoice><guimenu>View</guimenu><guimenuitem>Source</guimenuitem></menuchoice>
-	 </para>
-	 </tip>
-       </para>
-
-      <sect3 id="usage-mail-listorder">
-	<title>Ordenando la lista de mensajes</title>
-	<para>
-          One of the ways <application>Evolution</application> lets
-          you choose the way you work is the way it lets you sort your
-          message lists.  To sort by sender, subject, or date, click
-          on the bars with those labels at the top of the message
-          list. The direction of the arrow next to the label indicates
-          the direction of the sort, and if you click again, you'll
-          sort them in reverse order. For example, click once on
-          <guilabel>Date</guilabel> to sort messages by date from
-          oldest to newest.  Click again, and
-          <application>Evolution</application> sorts the list from
-          newest to oldest. You can also right-click on the message
-          header bars to get a set of sorting options, and add or
-          remove columns from the message list.  You can find detailed
-          instructions on how to customize your message display
-          columns in <xref linkend="usage-mail-organize-columns">.
-        </para>
-	<para>
-          You can also choose a threaded message view. Select
-          <menuchoice> <guimenu>View</guimenu>
-          <guimenuitem>Threaded</guimenuitem> </menuchoice> to turn
-          the threaded view on or off.  When you select this option,
-          <application>Evolution</application> groups the replies to a
-          message with the original, so you can follow the thread of a
-          conversation from one message to the next.
-        </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-delete">
-        <title>Borrando Correo</title>
-        <para>
-          Once you've read your mail, you may want to get rid of
-          it. To mark a message for deletion, select it in the the
-          <interface>message list</interface> by clicking on it once.
-          Then click on the <guibutton>Delete</guibutton> button in
-          the tool bar. Or, right-click on a message and choose
-          <guimenuitem>Delete</guimenuitem> from the right-click
-          menu. The message will appear with a line through it, to
-          show that you've marked it for deletion.
-        </para>
-        <para>
-          If you change your mind and decide you want to keep it,
-          select <menuchoice> <guimenu>Message</guimenu>
-          <guimenuitem>Undelete</guimenuitem></menuchoice>.  If you
-          really want to get rid of it, choose
-          <guimenuitem>Expunge</guimenuitem> from the
-          <guimenu>Folder</guimenu> menu.  That will delete it
-          permanently.
-        </para>
-      </sect3>
-    </sect2>
-
-    <sect2 id="usage-mail-getnsend-get">
-      <title>Comprobando el Correo</title>
-      <para>
-	Now that you've had a look around the
-	<interface>Inbox</interface>, it's time to check for new mail.
-	Click <guibutton>Get mail</guibutton> in the toolbar to check
-	your mail.  If it's the first time you've done so, the
-	<interface>mail setup assistant</interface> will ask you for
-	the information it needs to check your mail (see <xref
-	linkend="config-setupassist"> for more information). 
-     </para>
-     <para>
-        Then, you need to enter your email
-        password. <application>Evolution</application> will remember
-        your password until until you select <menuchoice>
-        <guimenu>Settings</guimenu> <guimenuitem>Forget
-        Passwords</guimenuitem> </menuchoice>.
-      </para>
-      <para>
-        Once it's validated the password,
-	<application>Evolution</application> will check your mail.
-	New mail will appear in the local <interface>Inbox</interface>
-	if you're using a <glossterm>POP</glossterm> account, and in
-	your <glossterm>IMAP</glossterm> folders if you use IMAP.  If
-	you have chosen to use IMAP, and you have multiple folders on
-	your IMAP server, you may need to subscribe to them.  To learn
-	how to use the subscription manager, read <xref
-	linkend="usage-mail-subscriptions">.
-      </para>
-   
-     <note id="badmailsettings">
-     <title>¿No Puede Leer su Correo?</title> 
-     <para>
-	If you get an error message instead of mail, you probably need
-	to change your network settings.  To learn how to do that,
-	have a look at <xref linkend="config-prefs-mail-network">, or
-	ask your system administrator.
-      </para>
-    </note>
-
-      <sect3 id="usage-mail-getnsend-get-news">
-         <title>Usando Evolution para las Noticias </title>
-       <para>
-         Newsgroups are so similar to email that there's no reason not
-         to read them side by side.  If you want to do that, add a
-         news source to your configuration (see <xref
-         linkend="config-prefs-network-news">). The news server will
-         appear as a remote server, and will look quite similar to an
-         IMAP folder.  When you click <guibutton>Get Mail</guibutton>,
-         <application>Evolution</application> will also check for news
-         messages.
-       </para>
-       </sect3>
-
-      <sect3 id="usage-mail-getnsend-get-attach">
-	<title>Adjuntos y correo en HTML</title>
-	<para>
-	  Si alguien le envía un <glossterm>adjunto</glossterm>, un
-	  archivo adjunto aun mensaje,
-	  <application>Evolution</application> mostrará en archivo en la
-	  parte de abajo del mensaje al que está adjuntado.  Texto,
-	  HTML, y la mayoría de imágenes se mostrarán dentro del mensaje.
-	  Para otros archivos,
-	  <application>Evolution</application> mostrará un icono al final
-	  del mensaje.  Pulse con el botón derecho sobre el icono para obtener
-	  una lista de opciones que variarán dependiendo del tipo de adjunto.
-	  Tendrá la opción de mostrar la mayoría de los archivos como parte del
-	  mensaje, exportarlos a otra aplicación (imágenes a Eye of GNOME, hojas
-	  de cálculo a Gnumeric, y así sucesivamente), o guardarlo en el disco.
-        </para>
-
-	<para>
-	   <application>Evolution</application> tambien puede mostrar
-	   correo formateado en HTML, completo con gráficos.  El formateado
-	   en HTML se mostrará automaticamente, aunque puede deshabilitarlo
-	   si lo prefiere.
-	</para>
-      </sect3>
-    </sect2>
-
-    <sect2 id="usage-mail-getnsend-send">
-      <title>Escribiendo y Enviando Correo</title>
-      <para>
-	 You can start writing a new email message by selecting
-	 <menuchoice> <guimenu>File</guimenu>
-	 <guisubmenu>New</guisubmenu> <guimenuitem>
-	 Mail Message</guimenuitem></menuchoice>, or by pressing the
-	 <guibutton>Compose</guibutton> button in the Inbox toolbar.
-	 When you do so, the <interface>New Message</interface> window
-	 will open, as shown in <xref
-	 linkend="usage-mail-newmsg-fig">.
-      </para>
-
-<!--   ==============Figure=================================== -->
-      <figure id="usage-mail-newmsg-fig">
-	<title>Ventana de Nuevo Mensaje</title>
-	<screenshot>
-	  <screeninfo>Evolution Main Window</screeninfo>
-	  <graphic fileref="fig/newmsg-pic" format="png" srccredit="Kevin Breit">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure=================================== -->
-
- <!-- Check the alignment of the following paragraph in the PS and
- HTML output: it's indented for no good reason -->
-      <para>
-	 Enter an address in the <guilabel>To:</guilabel> field, a
-	 subject in the <guilabel>Subject:</guilabel> and a message in
-	 the big empty box at the bottom of the window, and press
-	 <guibutton>Send</guibutton>.
-       </para>
-
-      <sect3 id="usage-mail-getnsend-send-delay">
-	<title>Guardando Mensajes para más tarde</title>
-	<para>
-	   Evolution enviará el mensaje inmediatamente a menos que le diga lo
-	   contrario seleccionando <menuchoice>
-	   <guimenu>Archivo</guimenu> <guimenuitem>Enviar más
-	   Tarde</guimenuitem></menuchoice>.  Esto añadirá sus mensajes
-	   a la cola de <guilabel>Outbox</guilabel>.  Esntonces,
-	   cuando pulse <guibutton>Enviar</guibutton> en otro
-	   mensaje, u <guibutton>Obtener</guibutton> en la ventana principal
-	   del correo, todos los mensajes no enviados se enviarán en ese momento.
-	   Me gusta usar "Enviar más Tarde" porque me permite tener la oportunidad
-	   de cambiar de opinión acerca de un mensaje antes de enviarlo.  De esa forma
-	   no envio nada de lo que me arrepentiré al día siguiente.
-	</para>
-	   Para aprender más acerca de como puede especificar el comportamiento de
-	   la cola de mensajes y de los filtros, vea <xref linkend="config-prefs-mail">.
-	</para>
-
-	<para>
-           You can also choose to save messages as drafts or as text
-           files.  Choose
-           <menuchoice>
-             <guimenu>File</guimenu>
-             <guimenuitem>Save</guimenuitem>
-	  </menuchoice>
-          or <guimenuitem>Save As</guimenuitem> to save your message
-          as a text file. If you prefer to keep your message in a
-          folder (the <guilabel>Drafts</guilabel> folder would be the
-          obvious place), you can select <menuchoice>
-          <guimenu>File</guimenu> <guimenuitem>Save In
-          Folder</guimenuitem> </menuchoice>. 
-        </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-send-compose">
-        <title>Composición Avanzada de Correo</title>
-        <para>
-	  You can probably guess the purpose of the buttons labelled
-	  <guibutton>Cut</guibutton>, <guibutton>Copy</guibutton>,
-	  <guibutton>Paste</guibutton>, <guibutton>Undo</guibutton>
-	  and <guibutton>Redo</guibutton>, but there's a bit more to
-	  sending mail that's less obvious.  In the next few sections,
-	  you'll see how <application>Evolution</application> handles
-	  additional features, including large recipient lists,
-	  attachments, and forwarding.
-        </para>
-      <sect4 id="usage-mail-getnsend-send-attach">
-	<title>Adjuntos</title>
-	<para>
-	    Si quiere adjuntar un archivo a su mensaje de correo, puede
-	    arrastrarlo desde su escritorio hasta la ventana del mensaje, o
-	    pulsar el botón con un clip de la barra de herramientas,
-	    con el título <guibutton>Adjuntar</guibutton>.  Si presiona el
-	    botón <guibutton>Adjuntar</guibutton>,
-	    <application>Evolution</application> abrirá una ventana de selección
-	    de archivos para preguntarle que archivo quiere enviar.
-	    Seleccione el archivo y pulse <guilabel>Aceptar</guilabel>.
-        </para>
-	<para>
-            To hide the display of files you've attached to the
-            message, select <menuchoice>
-            <guimenu>View</guimenu> <guimenuitem>Hide
-            Attachments</guimenuitem> </menuchoice>; to show them
-            again, choose <guimenuitem>Show Attachments</guimenuitem>.
-        </para>
-	<para>
-            When you send the message, a copy of the attached file
-	    will go with it.  Be aware that big attachments can take a
-	    long time to download.
-          </para>
-	</sect4>
-        <sect4 id="usage-mail-getnsend-send-to-types">
-         <title>Tipos de Destinatarios</title>
-        <para>
-	    <application>Evolution</application>, como la mayoría de
-	    los programas de correo reconoce tres tipos de direcciones
-	    destinatarios principales, destinatarios secundarios, y
-	    destinatarios escondidos ("oculto").
-         </para>
-         <para>
-	    La manera más simple de dirigir un mensaje es poner la dirección
-           o direcciones de correo en el campo <guilabel>A:</guilabel>,
-           el cual denota a los destinatarios principales.  Para enviar
-           correo a más de una o dos personas, puede usar el campo
-            <guilabel>Cc:</guilabel>.
-	  </para>
-	  <para>
-	    Volviendo la vista a las edades oscuras cuando la gente usaba máquinas
-	    de escribir y no habia fotocopiadoras, "Cc" significa
-	    "Copia de Carbón".  Uselo cuando quiera compartir un mensaje que ha
-	    escrito a otra persona.
-	    <example id="ex-mail-cc">
-	      <title>Usando el campo Cc:</title>
-	      <para>
-	         Cuando Susan envia un mensaje a un cliente, pone a su compañero,
-	         Tim, en el campo <guilabel>Cc:</guilabel>, para que sepa como van
-	         las cosas.  El cliente puede ver que Tim también recivió el
-	         mensaje, y sabe que también puede hablar con Tim acerca del
-	         mensaje.
-	      </para>
-	    </example>
-	  </para>
-	  <para>
-	    Si tiene un gran número de destinatarios, o si quiere mandar mensajes
-	    a varias personas sin mostrar la lista de destinatarios, debe usar
-	    <guilabel>Cco:</guilabel>. "Cco" significa "Con Copia Oculta",
-	    y envía los mensajes discretamente.  En otras palabras,
-	    las personas en el campo <guilabel>Cco:</guilabel> reciven el mensaje,
-	    pero nadie vee que lo recibieron.  Note que el contenido de los campos
-	    <guilabel>A:</guilabel> y <guilabel>Cc:</guilabel> son visibles para
-	    todos los destinatarios, incluso para las personas en la lista
-	    <guilabel>Cco:</guilabel>.
-
-	    <example id="ex-mail-bcc">
-	      <title>Usando el campo Cco:</title>
-	      <para>
-	         Tim está enviando un anuncio por correo a todos los clientes
-	         de su compañía, algunos de los cuales son competidores entre si,
-	         y todos ellos valoran su privacidad. En este caso necesita usar
-	         el campo <guilabel>Cco:</guilabel>.  Si pone todas las
-	         direcciones de su agenda de direcciones de "Clientes" en el
-	         campo <guilabel>A:</guilabel> o en el campo
-	         <guilabel>Cc:</guilabel>, hara que <emphasis>toda</emphasis>
-	         la lista de clientes de la compañía sea pública.
-	         Parece una pequeña diferencia, pero en ocasiones puede tener
-	         una gran importancia.
-	     </para>
-	    </example>
-	  </para>
-	</sect4>
-
-        <sect4 id="usage-mail-getnsend-send-to">
-	<title>Eligiendo Rápidamente a los Destinatarios</title>
-	<para>
-	  Si ha creado tarjetas de direcciones en el administrador de contactos,
-	  puede escribir apodos o otras porciones de los datos de la dirección, y
-	  <application>Evolution</application> completará la dirección por usted
-	  <!-- (INSERTAR descripción de la IU para esta caracteristica,
-	  una vez que se decida). --> Si escribe un nombre oun apodo
-	  puede coincidir con más de una tarjeta, Evolution abrirá una ventana de
-	  diálogo y le preguntará a quien se refiere.
-	  <!-- (TODAVIA NO) Tambien, <application>Evolution</application>
-	  añadirá un dominio a cualquier direccion incompleta.  Por defecto, será
-	  su dominio, pero puede elegirlo en el diálogo de preferencias del
-	  correo. -->
-          </para>
-	  <para>
-            Alternativamente, puede pulsar en los botones
-            <guibutton>A:</guibutton>, <guibutton>Cc:</guibutton>, o
-            <guibutton>Cco:</guibutton> para obtener una lista &mdash;
-            potencialmente muy larga &mdash; de las direcciones de correo
-            de su administrador de contactos.  Seleccione las direcciones y
-            pulse sobre las flechas para moverlas a la columna de direcciones
-            apropiada.
-          </para>
-	  <para>
-            Para más información acerca de usar el correo junto con el
-	    administrador de contactos y el calendario, vea <xref
-	    linkend="usage-contact-automate"> y <xref
-	    linkend="usage-calendar-apts">.
-	  </para>
-        </sect4>
-      </sect3>
-      
-      <sect3 id="usage-mail-getnsend-send-reply">
-	<title>Respondiendo Mensajes</title>
-	<para>
-	   Para resonder a un mensaje, pulse el botón
-	   <guibutton>Responder</guibutton> mientras está seleccionado,
-	   o elija <guimenuitem>Responder al Remitente</guimenuitem> del menu
-	   del botón derecho del mensaje.  Esto abrirá el
-	   <interface>compositor de mensajes</interface>.  Los campos
-	   <guilabel>A:</guilabel> y <guilabel>Asunto</guilabel>
-	   ya estarán escritos, aunque puede alterarlos si lo desea.
-	   Ademas, el texto completo del antiguo mensaje es insertado en el
-	   nuevo mensaje, bien sea con itálicas (para vista en HTML) o con el
-	   caracter &gt; precediendo cada línea (en modo texto plano), para
-	   indicar que es parte del mensaje previo.  Habitualmente la gente
-	   escribe su mensaje intercalado con el mensaje anterior, como se
-	   muestra en <xref linkend="usage-mail-getnsend-reply-fig">.
-
-<!-- note que esta imagen debe tener un mensaje de respuesta listo para ser
-enviado con partes quoteadas y las respuestas relevante intercaladas-->
- <!-- ==============Imagen=================================== -->
-       <figure id="usage-mail-getnsend-reply-fig">
-	 <title>Ventana de Respuesta de Mensajes</title>
-	 <screenshot>
-	  <screeninfo>Ventana Principal de Evolution</screeninfo>
-	  <graphic fileref="fig/replymsg" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============Fin de la Imagen=================================== -->
-	</para>
-
-	<para>
-	  If you're reading a message with several recipients, you may
-	   wish to use <guibutton>Reply to All</guibutton> instead of
-	   <guibutton>Reply</guibutton>.  If there are large numbers
-	   of people in the <guilabel>Cc:</guilabel> or
-	   <guilabel>To:</guilabel> fields, this can save substantial
-	   amounts of time. 
-	  <example>
-	    <title>Using the Reply to All feature</title>
-	    <para>
-	      Susan sends an email to a client and sends copies to Tim
-	      and to an internal company mailing list of co-workers.
-	      If Tim wants to make a comment for all of them to read,
-	      he uses <guibutton>Reply to All</guibutton>, but if he
-	      just wants to tell Susan that he agrees with her, he
-	      uses <guibutton>Reply</guibutton>.  Note that his reply
-	      will not reach anyone that Susan put on her
-	      <guilabel>Bcc</guilabel> list, since that list is not
-	      shared with anyone.
-	    </para>
-	  </example>
-	</para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-send-find">
-        <title>Searching and Replacing with the Composer</title>
-	<para>
-           You're probably familiar with search and replace features,
-           and if you come from a Linux or Unix background, you
-           probably know what <guimenuitem>Find Regex</guimenuitem>
-           does.  If you aren't among the lucky who already know,
-           here's a quick rundown of an important section of the
-           <guimenu>Edit</guimenu> menu.
-        </para>
-	<para>
-           <variablelist>
-	    <varlistentry>
-	      <term><guimenuitem>Find</guimenuitem></term>
-	      <listitem><para> Enter a word or phrase, and
-	      <application>Evolution</application> will find it
-              in your message.
-	      </para></listitem>
-	    </varlistentry>
-	    
-	    <varlistentry>
-	      <term><guimenuitem>Find Regex</guimenuitem></term>
-	      <listitem>
-		<para>
-                  Find a regex, also called a
-                  <glossterm linkend="regular-expression">regular
-                  expression</glossterm>, in your composer window.
-               </para>
-             </listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	      <term><guimenuitem>Find Again</guimenuitem></term>
-	      <listitem><para>
-                   Select this item to repeat the last search you performed.
-              </para></listitem>
-	    </varlistentry>
-
-	    <varlistentry>
-	       <term><guimenuitem>Replace</guimenuitem></term>
-	       <listitem><para> 
-                 Find a word or phrase, and replace it with
-	         something else.  
-               </para></listitem>
-	    </varlistentry>
-
-	  </variablelist>
-        </para>  
-	<para>
-            For all of these menu items, you can choose whether or not
-            to <guilabel>Search Backwards</guilabel> in the document
-            from the point where your cursor is.  For all but the
-            regular expression search (which doesn't need it), you are
-            offered a check box to determine whether the search is to
-            be <guilabel>Case Sensitive</guilabel> when it determines
-            a match.
-        </para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-send-html">
-	<title>Embelleciendo su correo con HTML</title>
-	<para>
-            Normally, you can't set text styles or insert pictures in
-            emails, which is why you've probably seen people use far
-            too many exclamation points for emphasis, or use
-            <glossterm linkend="emoticon">emoticons</glossterm> to
-            convey their feelings.  However, most newer email programs
-            can display images and text styles as well as basic
-            alignment and paragraph formatting. They do this with
-            <glossterm linkend="html">HTML</glossterm>, just like web
-            pages do.
-        </para>
-	<note>
-	  <title>El correo con HTML no está seleccionado por defecto</title>
-	  <para>
-	    Algunas personas no tienen clientes con capacidad para mostrar HMTL, o
-	    prefieren no recibir mensajes con HTML porque tarda más en descargar
-	    y en ser mostrado.  <emphasis>Algunas</emphasis> personas se hablan
-	    correo con HTML como "la raíz de todos los males" y se enfadan
-	    mucho si les envia correo con HTML, por lo cual
-	    <application>Evolution</application> envía texto plano a menos que
-	    pida explicitamente HTML.  Para enviar correo con HTML, necesitará
-	    seleccionar <menuchoice> <guimenu>Formato</guimenu>
-	    <guimenuitem>HTML</guimenuitem></menuchoice>.
-	    Alternativamente, puede elegir el formato por defecto de sus mensajes
-	    en el diálogo de configuración del correo.
-	    Vea <xref linkend="config-prefs-mail-other"> para más información.
-          </para>
-	</note>
-	<para>
-           HTML formatting tools are located in the toolbar just above
-	   the space where you'll actually compose the message, and
-	   they also appear in the <guimenu>Insert</guimenu> and
-	   <guimenu>Format</guimenu> menus.  
-	  </para>
-	  <para>
-            Los iconos de la barra de herramientas estan explicados en <glossterm
-            linkend="tooltip">Mensajes de Ayuda</glossterm>, los cuales aparecen
-            cuando detiene el ratón sobre los botónes.  Los botones entran en cuatro
-            categorías:
-            <variablelist>
-             <varlistentry>
-             <term>Cabeceras y listas</term>
-	      <listitem>
-		<para>
-                  En el lado izquierdo de la barra de herramientas, puede elegir entre
-                  <guilabel>Normal</guilabel> para un estilo de texto por defecto
-                  o <guilabel>Cabecera 1</guilabel> a
-                  <guilabel>Cabecera 6</guilabel> para variar los tamaños de las
-                  cabeceras desde grande (1) hasta pequeño (6). Otros estilos
-                  incluyen <guilabel>pre</guilabel>, para usar etiquetas HTML
-                  para preformatear los bloques de texto, y tres tipos de
-                  <guilabel>Elementos de Lista</guilabel> para los más
-                  organizados.
-                </para>
-	      </listitem>
-           </varlistentry>
-           <varlistentry>
-             <term>Estilo del texto</term>
-	      <listitem>
-		<para>
-                  Use estos botones para determinar el aspecto de sus cartas.
-                  Si tiene un texto seleccionado, el estilo se aplicará al texto
-                  seleccionado.  Si no tiene texto seleccionado el estilo se
-                  aplicará a lo siguiente que escriba.  Los botones son:
-                  <itemizedlist mark="none">      
-		  <listitem><para>Presione <guibutton>B</guibutton> para texto en negrita</para></listitem>   
-                  <listitem><para>Presione <guibutton>I</guibutton> para itálicas</para></listitem>
-		  <listitem><para>Presione <guibutton>U</guibutton> para subrayado</para></listitem>
-		  <listitem><para>Presione <guibutton>S</guibutton> para tachado.</para></listitem>
-                 </itemizedlist>
-               </para>               
-	      </listitem>    
-	    </varlistentry>
-	    <varlistentry>
-	      <term>Alineación</term>
-	      <listitem>
-		<para>
-                   Localizado al lado de los botones de estilo del texto, estos tres
-                   iconos de párrafo deberian ser familiares para aquellos usuarios de
-                   la mayoría de los procesadores de texto.  El botón más a la izquierda
-                   hará que su texto se alinee a la izquierda, el botón central, lo
-                   centrará, y el botón a la derecha, lo alinerá al lado derecho.
-                </para>
-	      </listitem>
-	      </varlistentry>
-
-	    <varlistentry>
-	      <term>Reglas de indentación</term>
-	      <listitem>
-		<para>
-                  El botón con la flecha hacia la izquierda reducirá
-                  la indentación de un párrafo, y la flecha a la derecha
-                  incrementará su indentación.
-               </para>
-	    </listitem>
-	  </varlistentry>
-
-	    <varlistentry>
-	      <term>Selección de colores</term>
-	      <listitem>
-		<para>
-                  En la parte derecha esta la herramienta de selección de color.
-                  La caja coloreada muestra el color actual del texto. Para
-                  elegir uno nuevo, pulse el botón con la flecha justo a su derecha.
-                  Si tiene texto seleccionado, el color será aplicado al texto
-                  seleccionado.  Si no tiene texto seleccionado, el color será aplicado
-                  a lo que escriba a continuación.
-               </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  </variablelist>
-        </para>
-	<para>
-           There are three tools that you can find only in the
-           <guimenu>Insert</guimenu> menu.
-           <variablelist>
-             <varlistentry>
-               <term><guimenuitem>Insert Link</guimenuitem>:</term>
-	       <listitem>
-	        <para>
-                  Use this tool to put hyperlinks in your HTML
-                  messages.  When you select it,
-                  <application>Evolution</application> will prompt you
-                  for the <guilabel>Text</guilabel> that will appear,
-                  and the <guilabel>Link</guilabel>, where you should
-                  enter the actual web address (URL). If you don't
-                  want special link text, you can just enter the address
-                  directly, and <application>Evolution</application>
-                  will recognize it as a link.
-               </para>
-	    </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term> <guimenuitem>Insert Image</guimenuitem>:</term>
-	    <listitem>
-	      <para>
-               Select this item to embed an image into your email, as
-               was done in the welcome message.  Images will appear at
-               the location of the cursor. This is different from
-               attaching them to a message, but not very different.
-              </para>
-	    </listitem>
-           </varlistentry>
-          <varlistentry>
-             <term><guimenuitem>Insert Rule</guimenuitem>:</term>
-             <listitem><para>
-               This will insert a horizontal line, or rule, into your document.
-               You'll be presented with a dialog box which gives you
-               the choice of size, percentage of screen, shading, and
-               alignment; if you leave everything at the default
-               values you'll get a thin black rule all the way across
-               the screen.</para></listitem>
-	</varlistentry>
-
-	  </variablelist>
-          </para>
-	  <note>
-	    <title>Una nota Técnica sobre las Etiquetas HTML</title>
-	    <para>
-	      El compositor de correo en un editor WYSIWYG (What You See Is What
-	      You Get "Lo Que Ve Es Lo Que Obtiene") de HTML. Esto significa que
-	      si escribe directamente HTML en el editor&mdash; digamos, 
-	      <markup role="html">&lt;B&gt;Bold Text&lt;/B&gt</markup>, el
-	      editor asumirá que quiere escribir exactamente esa cada de
-	      caracteres, y no "hacer poner texto en Negrita," como haría una
-	      herramienta de composición de HTML o un editor de texto.
-	    </para>
-	</note>
-      </sect3>
-   
-
-<!-- Function not implemented, 
-possibly never will be due to security evil. -->
-<!--
-	<sect3 id="usage-mail-getnsend-send-live">
-	  <title>Live Documents</title>
-	  <para>
-	    Later versions of <application>Evolution</application>
-	    will allow you to enliven your email with almost any
-	    sort of document, and even with entire
-	    applications. At this point, however, this feature has not 
-	    yet been implemented.
-	  </para>
-	</sect3>
--->
-
-      <sect3 id="usage-mail-getnsend-fwd">
-	<title>Reenviando Correo</title>      
-	<para>
-	  The post office forwards your mail for you when you change
-	  addresses, and you can forward mail when you get a letter by
-	  mistake.  The email <guilabel>Forward</guilabel> button
-	  works in much the same way.  It's particularly useful if you
-	  have received a message and you think someone else would
-	  like to see it.  You can forward a message as an attachment
-	  to a new message (this is the default) or
-	  you can send it <glossterm linkend="inline">inline</glossterm> as a quoted
-	  portion of the message you are sending.  Attachment
-	  forwarding is best if you want to send the full, unaltered
-	  message on to someone else.  Inline forwarding is best if
-	  you want to send portions of a message, or if you have a
-	  large number of comments on different sections of the
-	  message you are forwarding.  Remember to note from whom the
-	  message came, and where, if at all, you have removed or
-	  altered content.
-	</para>
-	<para>
-	  To forward a message you are reading, press
-	  <guibutton>Forward</guibutton> on the toolbar, or select
-	  <menuchoice> <guimenu>Message</guimenu>
-	  <guimenuitem>Forward</guimenuitem> </menuchoice>.  If you
-	  prefer to forward the message <glossterm linkend="inline">inline</glossterm>
-	  instead of attached, select <menuchoice>
-	  <guimenu>Message</guimenu> <guimenuitem>Forward
-	  Inline</guimenuitem> </menuchoice> from the menu.  Choose an
-	  addressee as you would when sending a new message; the
-	  subject will already be entered, but you can alter it.
-	  Enter your comments on the message in the
-	  <interface>composition frame</interface>, and press
-	  <guibutton>Send</guibutton>.
-	</para>
-      </sect3>
-      <sect3 id="usage-mail-getnsend-ettiquette">
-	<title>Siete Consejos de Cortesía en el Correo</title>
-	<para>
-	  Comenze con diez, pero cuatro eran "No envie
-	  <glossterm linkend="spam">spam</glossterm>."
-	  <itemizedlist>
-
-	    <listitem>
-	      <para>
-		 No envie spam ni reenvie cartas encadenadas.  Si debe hacerlo,
-		 tenga cuidado con los timos y las leyendas urbanas, y asegurese
-		 que el mensaje no tiene múltiples capas de signos mayor que, (&gt;)
-		 indicando multiples capas de reenvios desconsiderados.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		Siempre comienze y acabe con un saludo. Diga "por favor"
-		y "gracias", tal como hace en la vida real. Puede mantener
-		su cortesía excasa, pero ¡sea cortes!
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		¡TODO EN MAYUSCULAS SIGNIFICA QUE ESTÁ GRITANDO! No escriba todo el
-		mensaje en mayusculas.  Hace daño a los oidos de la gente.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		 Nunca escriba en un mensaje electrónico nada que no diría en público.
-		 Los mensajes antiguos tienen la mala costumbre de reaparecer cuando
-		 menos se lo espera.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-	       Compruebe su ortografía y use frases completas.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		No envie mensajes desagradebles (broncas).  Si recive uno,
-		no lo conteste.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		 Cuando responde o reenvía, incluya justo lo suficiente del mensaje
-		 anterior para tener un contexto: no incluya demasiado,
-		 ni demasiado poco.
-	       </para>
-	    </listitem>
-	  </itemizedlist>
-	</para>
-	<para> ¡Feliz envío de correo! </para>
-      </sect3>
-    </sect2>
-  </sect1>
-
-  <sect1 id="usage-mail-organize">
-    <title>Organizando Su Correo</title>
-    <para>
-      Even if you only get a few email messages a day, you probably
-      want to sort and organize them.  When you get a hundred a day
-      and you want to refer to a message you received six weeks ago,
-      you <emphasis>need</emphasis> to sort and organize them.
-      Fortunately, <application>Evolution</application> has the tools
-      to help you do it.
-    </para>
-    <sect2 id="usage-mail-organize-columns">
-      <title>Ordenando el Correo según las Columnas</title>
-      <para>
-         By default, the message list has columns with the following
-         headings: an envelope icon indicating whether you have read
-         or replied to a message (closed for unread, open for read,
-         and open with an arrow on it to indicate you've sent a
-         reply), an exclamation point indicating priority, and the
-         <guilabel>From</guilabel>, <guilabel>Subject</guilabel>, and
-         <guilabel>Date</guilabel> fields. You can change their order
-         and remove them by dragging and dropping them.  You can add
-         new ones with the <guimenuitem>Field Chooser</guimenuitem>
-         item in the right click menu for the column headings.
-      </para>
-      <para>
-         Right-click on one of the column headers to get a list of
-         options:
-             <variablelist>
-
-               <varlistentry>
-                  <term><guimenuitem>Sort Ascending</guimenuitem>,
-                  <guimenuitem>Sort Descending</guimenuitem>, and
-                  <guimenuitem>Unsort</guimenuitem></term>
-                  <listitem><para>Which should be pretty obvious. You
-                  can also set these sorts by just clicking on the
-                  column headers.</para></listitem>
-               </varlistentry>
-
-              <varlistentry>
-                  <term><guimenuitem>Group By this Field</guimenuitem></term>
-                  <listitem><para>
-                     Groups messages instead of sorting them. (FIXME: Explain further) 
-                  </para></listitem>
-               </varlistentry>
-
-              <varlistentry>
-                  <term><guimenuitem>Remove this
-                  Column</guimenuitem></term> <listitem><para> Remove
-                  this column from the display. You can also remove
-                  columns by dragging the header off the list and
-                  letting it drop.  </para></listitem>
-               </varlistentry>
-
-              <varlistentry>
-                  <term><guimenuitem>Field
-                  Chooser</guimenuitem></term> <listitem><para> A list
-                  of column headers; just drag and drop them into
-                  place between two existing headers. A red arrow will
-                  appear to show you where you're about to put the
-                  column.  </para></listitem>
-               </varlistentry>
-            </variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="usage-mail-organize-folders">
-      <title>Estar Organizando con Carpetas</title>
-      <para>
-	<application>Evolution</application> keeps mail, as well as
-	address cards and calendars, in folders.  You start out with a
-	few, like <guilabel>Inbox</guilabel>,
-	<guilabel>Outbox</guilabel>, and <guilabel>Drafts</guilabel>,
-	but you can create as many as you like.  Create new folders by
-	selecting <guisubmenu>New</guisubmenu> and then
-	<guimenuitem>Folder</guimenuitem> from the
-	<guimenu>File</guimenu> menu.
-	<application>Evolution</application> will as you for the name
-	and the type of the folder, and will provide you with a folder
-	tree so you can pick where it goes.
-      </para>
-      <para>
-        When you click <guibutton>OK</guibutton>, your new folder will
-	appear in the <interface>folder view</interface>.  You can
-	then put messages in it by dragging and dropping them, or by
-	using the <guibutton>Move</guibutton> button in the
-	toolbar. If you want to move several messages at once, click
-	on the ones you want to move while holding down the
-	<keycap>CTRL</keycap> key, or use <keycap>Shift</keycap> to
-	select a range of messages.  If you create a filter with the
-	<interface>filter assistant</interface>, you can have mail
-	moved to your folder automatically.
-      </para>
-        </sect2>    
-
-    <sect2 id="usage-mail-organize-search">
-      <title>Buscando Mensajes</title>
-      <para>
-	Most mail clients can search through your messages for you,
-	but <application>Evolution</application> does it faster. You
-	can search through just the message subjects, just the message
-	body, or both body and subject.
-      </para>
-      <para>
-	To start searching, enter a word or phrase in the text area
-	right below the toolbar, and choose a search type:
-	<variablelist>
-	  <varlistentry>
-	    <term><guilabel>Body or subject contains:</guilabel></term>
-	  <listitem>
-	      <para>
-	        This will search message subjects and the messages
-	        themselves for the word or phrase you've entered in
-	        the search field.
-   	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term> <guilabel>Body contains:</guilabel> </term>
-	    <listitem>
-	      <para>
-	        This will search only in message text, not the subject
-	        lines.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Subject contains:</guilabel></term>
-	    <listitem>
-	      <para>
-	        This will show you messages where the search text is
-	        in the subject line.  It will not search in the
-	        message body.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Body does not contain:</guilabel></term>
-	    <listitem>
-	      <para>
-	        This finds every email message that does not have the
-	        search text in the message body.  It will still show
-	        messages that have the search text in the subject
-	        line, if it is not also in the body.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Subject does not contain:</guilabel></term>
-	    <listitem>
-	      <para>
-	        This finds every mail whose subject does not contain
-	        the search text.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-
-        When you've entered your search phrase, press
-        <keycap>Enter</keycap>.  <application>Evolution</application>
-        will show your search results in the message list.
-      </para>
-
-      <para>
-         If you think you'll want to return to a search again, you can
-         save it as a virtual folder by selecting <guilabel>Store
-         Search as Virtual Folder</guilabel>.
-      </para>
-
-      <para>
-         When you're done with the search, go back to seeing all your
-         messages by choosing <guimenuitem>Show All</guimenuitem> from
-         the <guilabel>Search</guilabel> drop-down box. If you're
-         sneaky, just enter a blank search: since every message has at
-         least one space in it, you'll see every message in the
-         folder.
-      </para>
-
-      <para>
-        If you'd like to perform a more complex search, open the
-        advanced search dialog by selecting
-        <guilabel>Advanced...</guilabel> from the
-        <guilabel>Search</guilabel> drop-down menu.  Then, create your
-        search criteria (each with the same options you saw in the
-        regular search bar), and decide whether you want to find
-        messages that match all of them, or messages that match even
-        one. Then, click <guibutton>Search</guibutton> to go and find
-        those messages.
-     </para>
-
-     <para>
-        You'll see a similar approach to sorting messages when you
-        create filters and virtual folders in the next few sections.
-     </para>
-
-    </sect2>
-
-    <sect2 id="usage-mail-organize-filters">
-      <title>Estar organizado: Filtros de correo en Evolution</title>
-      <para>
-        I once worked in the mail room of a large company, where my
-        job was to bundle, sort, and distribute mail to the various
-        mail boxes and desks throughout the building.  Filters do that
-        same job with email, but they lose much less mail than I did.
-        In addition, you can have multiple filters performing multiple
-        actions that may effect the same message in several ways.  For
-        example, your filters could put copies of one message into
-        multiple folders, or keep a copy and send one to another
-        person as well, and it can do that in under a second. Which is
-        to say, it's faster and more flexible than an actual person
-        with a pile of envelopes.
-      </para>
-      <para>
-        Most often, you'll want to have
-        <application>Evolution</application> put mail into different
-        folders, but you can have it do almost anything you like.
-        People who get lots of mail, or who often need to refer to old
-        messages, find filters especially helpful, but they're good
-        for anybody who gets more than a few messages a day.  To
-        create a filter, open the <interface>filter
-        assistant</interface> by selecting
-	<menuchoice>
-	  <guimenu>Settings</guimenu> 
-          <guimenuitem>Mail Filters</guimenuitem>
-        </menuchoice>.
-      </para>
-            
-       <figure id="usage-mail-filters-fig-assist">
-	 <title>El Asistente de Filtros</title>
-	 <screenshot>
-	  <screeninfo>The Filter Assistant</screeninfo>
-	  <graphic fileref="fig/filter-assist-fig" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-
-      <para>
-        The <interface>filter assistant</interface> window contains a
-        list of your current filters, sorted by the order in which
-        they are used.  From the drop-down box at the top of the
-        window, choose <guilabel>Incoming</guilabel> to display
-        filters for incoming mail, and <guilabel>Outgoing</guilabel>
-        for those which sort only outgoing mail.
-      </para>
-      <para>
-         The <interface>filter assistant</interface> also has a set of
-         buttons:
-        <itemizedlist>
-
-           <listitem><para>
-            <guibutton>Add</guibutton> &mdash; Create a new filter.
-           </para></listitem>
-
-           <listitem><para>
-            <guibutton>Edit</guibutton> &mdash; Edit an existing filter.
-           </para></listitem>
-
-           <listitem><para>
-            <guibutton>Delete</guibutton> &mdash; Delete the selected filter.
-           </para></listitem>
-
-           <listitem><para> <guibutton>Up</guibutton> &mdash; Move the
-            selected filter up in the list so it gets applied first.
-           </para></listitem>
-
-           <listitem><para>
-            <guibutton>Down</guibutton> &mdash;  Move the selected filter down 
-             in the list, so it comes into play later.
-           </para></listitem>
-        </itemizedlist>
-
-        If you don't have any filters set up, the only one of those
-        buttons you can click is <guibutton>Add</guibutton>, which
-        will open a dialog to let you add a filter rule.  If you do
-        have filters, you can either add a new filter rule, or select
-        one from your list and click <guibutton>Edit</guibutton>.
-      </para>
-      <para>
-        The filter rule editor, shown in <xref
-        linkend="usage-mail-filters-fig-new">, is where you'll
-        actually create your filtering rule.
-
-       <figure id="usage-mail-filters-fig-new">
-	 <title>Creating a new Filter</title>
-	 <screenshot>
-	  <screeninfo>Creating a new Filter</screeninfo>
-	  <graphic fileref="fig/filter-new-fig" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-      </para>
-      <para>
-        Enter a name for your filter in the <guilabel>Rule
-        Name</guilabel> field, and then begin choosing the criteria
-        you'd like to use as you sort your mail.  Choose how many
-        criteria you'd like by pressing <guibutton>Add
-        Criterion</guibutton> and <guibutton>Remove
-        Criterion</guibutton>.  If you have multiple criteria, you
-        should then decide whether to have the filter do its job only
-        <guilabel>if all criteria are met</guilabel>, or <guilabel>if
-        any criteria are met</guilabel>.
-     </para>
-     <para>
-        For each filter criterion, you must first select what
-        part of the message you want the filter to examine:
-        <variablelist>
-	  <varlistentry>
-	    <term><guilabel>Sender</guilabel></term>
-	    <listitem><para>
-                The sender's address.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Recipients</guilabel></term>
-	    <listitem><para>
-               The recipients of the message.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Subject</guilabel></term>
-	    <listitem><para>
-                The subject line of the message.
-            </para></listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guilabel>Specific Header</guilabel></term>
-	    <listitem><para>
-              The filter can look at any header you
-	      want, even obscure or custom ones. Enter the header name
-	      in the first text box, and put your search text in the
-	      second one.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Message Body</guilabel></term>
-	    <listitem><para>
-                Search in the actual text of the message.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Expression</guilabel></term>
-	    <listitem>
-             <para>
-               Enter a <glossterm linkend="regular-expression">regular
-	       expression</glossterm>, and
-	       <application>Evolution</application> will search the
-	       entire message, including headers, to match it for you.
-	     </para>
-           </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term><guilabel>Date Sent</guilabel></term>
-	    <listitem><para> Filter messages by when they were sent:
-	    First, choose the conditions you want a message to
-	    meet&mdash; <guilabel>before</guilabel> a given time,
-	    <guilabel>after</guilabel> it, and so forth.  Then, choose
-	    the time. The filter will compare the message's time-stamp
-	    to the system clock when the filter is run, or to a
-	    specific time and date you choose from a calendar.  You
-	    can even have it look for messages within a range of time
-	    relative to the filter&mdash perhaps you're looking for
-	    messages less than two days old.  </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Date Recieved</guilabel></term>
-	    <listitem><para>
-                This works the same way as the <guilabel>Date Sent</guilabel> 
-                option, except that it compares the time you got the message 
-                with the dates you specify.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Priority</guilabel></term>
-	    <listitem><para>
-               Emails have a standard priority range from -3 (least
-               important) to 3 (most important). You can have filters set the
-               priority of messages you recieve, and then have other filters 
-               applied only to those messages which have a certain priority.
-            </para></listitem>
-           </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Regex Match</guilabel></term>
-	    <listitem>
-              <para>
-                If you know your way around a <glossterm
-  	        linkend="regular-expression">regex</glossterm>, or
-  	        regular expression, put your knowledge to use here.
-  	       </para>
-            </listitem>
-          </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Source</guilabel></term>
-	    <listitem>
-               <para>
-               Filter messages according the server you got them from.
-               You can enter a URL or choose one from the drop-down
-               list.  This ability is only relevant if you use more
-               than one mail source.
-             </para>
-            </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-        <para>
-        Now, tell it what to do with those messages.  If you want more
-        actions, click <guibutton>Add Action</guibutton>; if you want
-        fewer, click <guibutton>Remove Action</guibutton>.  And choose
-        again:
-        <variablelist>
-
-	  <varlistentry>
-	    <term><guilabel>Copy to Folder</guilabel></term>
-	    <listitem><para>
-               If you select this item, <application>Evolution</application>
-               will put the messages into a folder you specify.  Click the 
-               <guibutton>&lt;click here to select a folder&gt;</guibutton> button
-               to select a folder. 
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Move to Folder</guilabel></term>
-	    <listitem><para>
-               If you select this item, <application>Evolution</application>
-               will put the messages into a folder you specify.  Click the 
-               <guibutton>&lt;click here to select a folder&gt;</guibutton> button
-               to select a folder. 
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Forward to Address</guilabel></term>
-	    <listitem><para>
-                Select this, enter an address, and the addressee will
-                get a copy of the message.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Delete</guilabel></term>
-	    <listitem><para>
-                Marks the message for deletion.  You can still get the message
-                back, at least until you <guimenuitem>Expunge</guimenuitem> your
-                mail yourself.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Stop Processing</guilabel></term>
-	    <listitem><para>
-              Select this if you want to tell all other filters to ignore 
-              this message, because whatever you've done with it so far
-              is plenty.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Assign Color</guilabel></term>
-	    <listitem><para>
-                Select this item, and <application>Evolution</application>
-                will mark the message with whatever color you please.
-            </para></listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term><guilabel>Assign Score</guilabel></term>
-	    <listitem><para> If you know that all mail with
-	    "important" somewhere in the message body line is
-	    important, you can give it a high priority score. In a subsequent filter you can 
-            then arrange your messages by their priority score.
-	  </para></listitem>
-	  </varlistentry>
-
-	</variablelist>
-      </para>
-      <para>
-        You're done.  Click <guibutton>OK</guibutton> to use this
-        filter, or <guibutton>Cancel</guibutton> to close the window
-        without saving any changes.
-      </para>
-
-
-
-   <!-- FIXME: This needs to be in there.  But the feature is temporarily
-         disabled and I don't know how it will be reimplemented.
-
-	  <itemizedlist>
-	    <listitem>
-	       <para>
-		 <guilabel>When mail arrives:</guilabel> Select
-		 this option to have messages filtered as they
-		 arrive.
-	       </para>
-	     </listitem>
-	     <listitem>
-	       <para>
-		 <guilabel>When mail is sent:</guilabel> Select
-		 this option to filter your outgoing mail.  You
-		 can use this feature to keep your
-		 <interface>Outbox</interface> as organized as
-		 your <interface>Inbox</interface>.
-	     </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-
-    -->
-
-      <note>
-	<title>Dos Características Notables de los Filtros</title>
-	<para>
-	  <itemizedlist>
-	    <listitem><para>
-              El correo de entrada que sus filtros no mueven va a la carpeta Inbox; 
-              el correo de salida que no mueven acaba en la carpeta Sent.
-             </para>
-	    </listitem>
-
-	    <listitem><para>Si mueve una carpeta, sus filtros
-	    la seguirán.  </para></listitem>
-	  </itemizedlist>
-	</para>
-      </note>
-    </sect2>
-
-
-
-    <sect2 id="usage-mail-organize-vFolders">
-      <title>Estar Realmente Organizado con Carpetas Virtuales</title>
-      <para>
-	If filters aren't flexible enough for you, or you find
-	yourself performing the same search again and again, consider
-	a virtual folder. Virtual folders, or vFolders, are an
-	advanced way of viewing your email messages within
-	<application>Evolution</application>.  If you get a lot of
-	mail or often forget where you put messages, virtual folders can help
-	you stay on top of things.
-      </para>
-      <para>
-	A virtual folder is really a hybrid of all the other organizational
-	tools: it looks like a folder, it acts like a search, and you
-	set it up like a filter.  In other words, while a conventional
-	folder actually contains messages, a virtual folder is a view of
-	messages that may be in several different folders.  The
-	messages it contains are determined on the fly using a set of
-	criteria you choose in advance.
-      </para>
-
-      <para>
-	As messages that meet the virtual folder criteria arrive or are
-	deleted, <application>Evolution</application> will
-	automatically place them in and remove them from the
-	virtual folder contents list.  When you delete a message, it gets
-	erased from the folder in which it actually exists, as well as
-	any virtual folders which display it.
-      </para>
-
-      <para>
-	Imagine a business trying to keep track of mail from hundreds
-	of vendors and clients, or a university with overlapping and
-	changing groups of faculty, staff, administrators and
-	students.  The more mail you need to organize, the less you
-	can afford the sort of confusion that stems from an
-	organizational system that's not flexible enough.  Virtual folders
-	make for better organization because they can accept
-	overlapping groups in a way that regular folders and filing
-	systems can't.
-      </para>
-
-      <example id="usage-mail-organize-vFolders-ex">
-	<title>Usando Carpetas, Búsquedas, y Carpetas Virtuales</title>
-	<para>
-	   Para organizar el correo en mi buzón, defino una carpeta virtual para
-	   los mensajes de mi amiga y compañera Anna.  Tengo otra para los
-	   los mensajes que tienen "ximian.com" en la dirección y "Evolution"
-	   en el asunto, así puedo registrar que personas del trabajo me escriben
-	   acerca de <application>Evolution</application>. Si Anna me envía un
-	   mensaje acerca de cualquier cosa excepto Evolution, solo aparece
-	   en la carpeta "Anna". Cuando Anna me escribe acerca de la interfaz
-	   de usuario de <application>Evolution</application>, puedo ver ese
-	   mensaje en la carpeta virtual "Anna" y en la carpeta virtual
-	   "Discusión Interna sobre Evolution".
-	</para>
-      </example>
-
-	<!--  (INSERT SCREENSHOT HERE: virtual folders in action) -->
-
-      <para>
-	 To create a virtual folder, select <menuchoice>
-	 <guimenu>Settings</guimenu> <guimenuitem>Virtual Folder
-	 Editor</guimenuitem> </menuchoice>.  This will bring up a
-	 dialog box that looks suspiciously like the filter window
-	 (for more information on filters, see <xref
-	 linkend="usage-mail-organize-filters">), and which
-	 presents you with a list of virtual folders you have previously
-	 created. If you have created any virtual folders, they are listed
-	 here, and you can select, edit or remove them if you wish.
-	 If you have not created any, there will be only one available
-	 option: click <guibutton>Add</guibutton> to add a new
-	 Virtual Folder.
-      </para>
-      <para>
-	 You can enter a name for your virtual folder in the
-	 <guilabel>Name</guilabel>.  Then, tell
-	 <application>Evolution</application> what messages to look
-	 for.  This process is exactly like filter creation: decide
-	 between <guilabel>Match all parts</guilabel> and
-	 <guilabel>Match any part</guilabel>, then choose what part of
-	 the message to look in, what sort of matching to perform, and
-	 specify exactly what it is that you want to find, be it a
-	 line of text, a score, a regular expression, or a particular date or
-	 range of dates.
-       </para>
-       <para>
-         The second part, however, is slightly different.  In the
-         section of the window labelled <guilabel>Virtual Folder Sources
-         </guilabel> is a list of folders in which
-         <application>Evolution</application> will search for the
-         contents of your vFolder.  Click <guibutton>Add</guibutton>
-         to add a folder, or <guibutton>Remove</guibutton> to remove
-         one.  That way, you can have your vFolder search in
-         newsgroups, or just in one of your mailboxes, or just in a
-         select few folders you've already screened with filters.
-       </para>
-       <para>
-        The vFolder creation window is shown in <xref
-	linkend="usage-mail-vfolder-fig-createrule">
-
-       <figure id="usage-mail-vfolder-fig-createrule">
-	 <title>Selecting a vFolder Rule</title>
-	 <screenshot>
-	  <screeninfo>Creating a vFolder Rule</screeninfo>
-	  <graphic fileref="fig/vfolder-createrule-fig" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-      </para>
-    </sect2>
-    <sect2 id="usage-mail-subscriptions">
-      <title>Subscription Management</title>
-      <para>
-         <application>Evolution</application> lets you handle your
-         IMAP and newsgroup subscriptions with the same tool: the
-         subscriptions manager.  To start using it, choose
-         <menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Manage
-         Subscriptions</guimenuitem> </menuchoice>.
-      </para>
-      <para>
-         If you have configured any IMAP (mail) or NNTP (news)
-         servers, you will see them listed in the left half of the
-         subscription management window.  Click on a server to select
-         it, and you will see the folders or newsgroups available to
-         you.  You can then select individual folders and subscribe to
-         them, or remove yourself from the subscription list.
-      </para>
-      <para>
-        Once you have subscribed to a folder or newsgroup, your system
-        will check for new messages whenever you press the
-        <guibutton>Get Mail</guibutton> button.
-      </para>
-
-    </sect2>
-  </sect1>
-</chapter>
-
-
diff --git a/help/es/usage-mainwindow.sgml b/help/es/usage-mainwindow.sgml
deleted file mode 100644
index 44dd90350a..0000000000
--- a/help/es/usage-mainwindow.sgml
+++ /dev/null
@@ -1,453 +0,0 @@
-<!--
- <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-<chapter id="usage-mainwindow">
-
-  <title>La Ventana Principal: Conceptos Básicos de Evolution</title>
-  <para>
-     Start <application>Evolution</application> by selecting
-     <menuchoice><guimenu>Main Panel Menu</guimenu>
-     <guisubmenu>Applications</guisubmenu>
-     <guimenuitem>Evolution</guimenuitem></menuchoice> or by typing
-     <command>evolution</command> at the command line.  The first time
-     you run the program, it will create a directory called
-     <filename>evolution</filename> in your home directory, where it
-     will keep all your <application>Evolution</application>-related
-     files.
-   </para>
-   <para>
-     After <application>Evolution</application> starts
-     up, you will see the <interface>main window</interface>, with the
-     <interface>Inbox</interface> open.  It should look a lot like the
-     picture in <xref linkend="usage-mainwindow-fig">. On the left of
-     the <interface>main window</interface> is the <interface>shortcut
-     bar</interface>, with several buttons in it.  Just underneath the
-     title bar is a series of menus in the <interface>menu
-     bar</interface>, and below that, the <interface>tool
-     bar</interface> with buttons for different functions. The largest
-     part of the <interface>main window</interface> is taken up by the
-     actual <interface>Inbox</interface>, where messages are listed
-     and displayed.  If you're running the program for the first time,
-     you'll have just one message: a welcome from Ximian.
-
-
-<!-- ==============Figure=================================== -->
-    <figure id="usage-mainwindow-fig">
-    <title>Evolution Main Window and Inbox</title>
-    <screenshot>
-      <screeninfo>Evolution Main Window</screeninfo>
-      <graphic fileref="fig/mainwindow-pic" format="png" srccredit="Kevin Breit">
-	</graphic>
-    </screenshot>
-    </figure>
-<!-- ==============End of Figure=================================== -->
-</para>
-
-   <para>
-    <note>
-      <title>The Way Evolution Looks</title>
-      <para>
-	The appearance of both <application>Evolution</application>
-	and <application>GNOME</application> is very easy to
-	customize, so your screen might not look like this picture.
-	You might decide to have <application>Evolution</application>
-	start with the calendar and a folder bar, or with the contact
-	manager occupying the entire window.
-      </para>
-    </note>
-  </para>
-  
-  <sect1 id="usage-mainwindow-shortcutbar">
-    <title>La Barra de Atajos</title>
-    <para>
-        <application>Evolution</application>'s most important job is
-        to give you access to your information and help you use it
-        quickly.  One way it does that is through the
-        <interface>shortcut bar</interface>, the column on the left
-        hand side of the main window.  The large buttons with names
-        like <guilabel>Inbox</guilabel> and
-        <guilabel>Contacts</guilabel> are the shortcuts, and you can
-        select different groups of shortcuts by clicking the
-        rectangular group buttons.
-    </para>
-    <para>
-       The shortcut group buttons are <guibutton>Evolution
-       Shortcuts</guibutton> and <guibutton>Internet
-       Directories</guibutton>.  When you click on them, they'll slide
-       up and down to give you access to different sorts of shortcuts.
-       When you first start <application>Evolution</application>, you
-       are looking at the <guilabel>Evolution Shortcuts</guilabel>
-       category.  If you click <guilabel>Internet
-       Directories</guilabel>, it will slide up and you'll see buttons
-       for the <guilabel>Bigfoot</guilabel> and
-       <guilabel>Netcenter</guilabel> directories, as well as any
-       others you or your system administrator may have added. You can
-       add more groups by right-clicking on the background of the
-       shortcut bar and selecting <guimenuitem>Menu
-       Group</guimenuitem>.  Internet directories behave a lot like
-       the local contact manager, which is covered in <xref
-       linkend="usage-contact">.
-       </para>
-    <para>
-       Take a look at the <guilabel>Evolution Shortcuts</guilabel>
-       again.  The shortcut buttons in that category are:
-
-      <variablelist>
-
-<!--  NOT IMPLEMENTED! 
-	<varlistentry>
-	<term> <guibutton>Today:</guibutton></term>
-	<listitem>
-	  <para>
-	This will bring up a summary of any new messages you've
-	received, along with the tasks and appointments you have
-	lined up for today.
-      </para>
-      </listitem>
-      </varlistentry>
--->
-
-
-	<varlistentry>
-	  <term> <guibutton>Executive Summary:</guibutton></term>
-	  <listitem>
-	    <para>
-	      Start your day here.  The Executive summary gives you
-              lists of new or important messages, daily appointments
-              and urgent tasks.  You can customize its appearance and
-              content, and use it to access Evolution services.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-
-	<varlistentry>
-	  <term> <guibutton>Inbox:</guibutton></term>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Inbox</guibutton> button to start
-	      reading your mail.  Your Inbox is also where you can
-	      access Evolution's tools to filter, sort, organize, and
-	      search your mail.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><guibutton>Calendar:</guibutton></term>
-	  <listitem>
-	    <para>
-	      The Calendar can store your appointments and To do lists
-	      for you.  Connected to a network, you can use it to keep
-	      a group of people on schedule and up to date.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-       <varlistentry>
-         <term><guibutton>Tasks:</guibutton></term>
-	<listitem>
-	  <para>
-	     A full-size view of your calendar's task pad.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-	<varlistentry>
-	  <term><guibutton>Contacts:</guibutton></term>
-	  <listitem>
-	    <para>
-	      The Contact Manager holds your addresses, phone numbers,
-	      and contact information.  Like calendar information,
-	      contact data can be synchronized with hand-held devices
-	      and shared over a network.
-	   </para>
-	  </listitem>
-	</varlistentry>
-
-<!-- NOT IMPLEMENTED YET
-
-
-	<varlistentry>
-	  <term> <guibutton>Notes:</guibutton></term>
-	<listitem>
-	  <para> The note pad is your catch-all tool: use it to take
-	    messages from phone conversations, keep small things
-	    organized, write <glossterm linkend="haiku">haiku</glossterm>, or whatever
-	    you like. This feature is not yet implemented, but will be
-	    soon. See <xref linkend="usage-notes"> for more
-	    information.
-	  </para>
-	</listitem>
-	</varlistentry>
--->
-
-      </variablelist>
-    </para>
-    <para>
-      If you don't like the shortcut bar, you can use the folder bar
-      or the menu bar to navigate the main window. Press 
-            <keycombo action="simul">
-                 <keycap>Ctrl</keycap> 
-                 <keycap>O</keycap> 
-             </keycombo>
-      to choose from a list of folders you'd like to visit, or use the
-      drop-down folder bar.  You can hide and show the folder bar and
-      the shortcut bar by selecting those items in the
-      <guimenu>View</guimenu> menu.
-    </para>
-
-    <tip>
-       <title>Trucos de la Barra de Atajos</title>
-       <para>
-         To remove a shortcut from the shortcut bar, right-click on it
-         and select <guimenuitem>Remove</guimenuitem>.  To add one,
-         select <menuchoice> <guimenu>File</guimenu>
-         <guisubmenu>New</guisubmenu> <guimenuitem>Evolution Bar
-         Shortcut</guimenuitem> </menuchoice>.
-      </para>
-       <para>
-         To change the way the shortcut bar looks, right-click in an
-         empty space on the shortcut bar.  From the menu that appears,
-         you can select icon sizes.
-       </para>
-    </tip>
-  </sect1>
-
-  <sect1 id="usage-mainwindow-folderbar">
-    <title>La Barra de Carpetas</title>
-    <para>
-      The <interface>folder bar</interface> is a more comprehensive
-      way to view the information you've stored with
-      <application>Evolution</application>. It displays all your
-      appointments, address cards, and email in a tree that's a lot
-      like a <glossterm linkend="filetree">file
-      tree</glossterm>&mdash; it starts small at the top, and branches
-      downwards. On most computers, there will be three or four
-      folders at the base.  First is the <guilabel>Local</guilabel>
-      folder, which holds all the <application>Evolution</application>
-      data that's stored on your computer.  After that come
-      <guilabel>Virtual Folders</guilabel>, or virtual folders, discussed in
-      <xref linkend="usage-mail-organize-vfolders">, followed by any
-      <glossterm linkend="imap">IMAP</glossterm> mail folders you may
-      have available to you over your network.  Lastly, there are
-      <guilabel>External Directories</guilabel>, <glossterm
-      linkend="ldap">LDAP</glossterm> contact directories stored on a
-      network.
-    </para>
-    <para>
-       
-      A typical <guilabel>Local</guilabel> folder contains the following folders:
-      <itemizedlist>
-	 <listitem>
-	    <para>
-	     <guilabel>Calendar</guilabel>, for appointments and
-	     event listings.
-	   </para>
-	 </listitem> 
-	 <listitem>
-	    <para>
-	    <guilabel>Contacts</guilabel>, for address cards.
-	   </para>
-	 </listitem>
-	 <listitem>
-	    <para>
-	     <guilabel>Inbox</guilabel>, for incoming mail. 
-	   </para>
-	 </listitem>
-         <listitem>
-	    <para>
-	    <guilabel>Drafts</guilabel>, for messages you started and didn't finish.
-	   </para>
-	 </listitem>
-	<listitem>
-	    <para>
-	    <guilabel>Sent</guilabel>, for sent mail.
-	   </para>
-	 </listitem>
-	<listitem>
-	    <para>
-	    <guilabel>Trash</guilabel>, which is used to store
-	    messages you don't want, but keep around just in case you
-	    change your mind.
-	   </para>
-	 </listitem>
-	<listitem>
-	    <para>
-	    <guilabel>Outbox</guilabel>, for messages you have written
-	    but not yet sent.  This will be empty unless you use
-	    <application>Evolution</application> while offline.
-	   </para>
-	 </listitem>
-
-      </itemizedlist>
-
-    </para>
-    <tip id="foldertips">
-    <title>Navegando sin la Barra de Carpetas</title>
-       <para>
-         You don't need the folder bar or the shortcut bar to move
-         around the main window. You can use <keycap>Tab</keycap> to
-         switch from one part of the window to another, and the folder
-         menu on the right side of the window just below the toolbar
-         to move about the folder tree.
-       </para>
-     </tip>
-
-    <para>
-       To create a new folder, select <menuchoice>
-       <guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
-       <guimenuitem>Folder</guimenuitem></menuchoice>.  You'll be asked where you want to
-       put it, and what kind of folder it should be.  You can choose
-       from three types: <guilabel>Mail</guilabel>, for storing mail,
-       <guilabel>Calendar</guilabel> for storing calendars, and
-       <guilabel>Contacts</guilabel> for storing contacts.
-    </para>
-
-       <note>
-	  <title>Las Carpetas Tienen Limitaciones</title>
-	  <para>
-              Los calendarios deben ir en carpetas de calendarios, el correo
-	      en carpetas de correo, y los contactos en carpetas de contactos.
-           </para>
-	</note>
-
-    <para>
-      Right-clicking will bring up a menu for just about anything
-      in GNOME, and <application>Evolution</application> is no
-      exception.  If you right-click on a folder, you'll have a
-      menu with the following options:
-      <itemizedlist>
-	<listitem><para><guimenuitem>FIXME</guimenuitem>, for another purpose. </para></listitem>
-	<listitem><para><guimenuitem>Something else</guimenuitem>, for another purpose. </para></listitem>
-      </itemizedlist>.
-    </para>
-
-    <tip>
-     <title>Ayuda Sensible al Contexto</title>
-      <para>
-	GNOME 2.0 will support context-sensitive help, which means you
-	can almost always get help on an item by right-clicking it.
-	If you're not sure what something is, or don't know what you
-	can do with it, choosing <guimenuitem>Help</guimenuitem> from
-	the right-click menu is a good way to find out.
-      </para>
-    </tip>
-
-    <para>
-      Any time new information arrives in a folder, that folder label
-      is displayed in bold text.
-    </para>
-    <para>
-      To delete a folder, right-click it and select
-      <guimenuitem>Delete</guimenuitem> from the menu that pops up.
-      To change the order of folders, or put one inside another, use
-      drag-and-drop.  To move individual
-      messages, appointments, and address cards between folders, you
-      can do the same thing: drag them where you want them, and
-      they'll go.
-    </para>
-  </sect1>
-  <sect1 id="usage-mainwindow-menubar">
-    <title>La Barra de Menú</title>
-    <para>
-      The <interface>menu bar</interface>'s contents will always
-      provide all the possible actions for any given view of your
-      data.  That means that, depending on the context, menu bar items
-      will change.  If you're looking at your Inbox, most of the menu
-      items will relate to mail; some will relate to other components
-      of <application>Evolution</application> and some, especially
-      those in the <guimenu>File Menu</guimenu> will relate to the
-      application as a whole. The contents of the menu bar are
-      described in <xref linkend="menuref">.
-   </para>
-   <para>
-      <variablelist>
-        <varlistentry>
-          <term> <guimenu>File</guimenu> Menu</term>
-
-          <listitem><para> 
-            Anything even related to a file or to the operations
-            of the application generally  falls under this
-            menu: creating things, saving them to disk, 
-            printing them, and quitting the program itself.  
-
-            </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>Edit</guimenu> Menu </term>
-          <listitem><para>
-              The <guimenu>Edit</guimenu> menu holds
-              useful tools that help you edit text and move it around.
-          </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>View</guimenu> Menu </term>
-          <listitem><para>
-            This menu lets you decide how <application>Evolution</application> 
-            should look. Some of the features control the appearance of 
-            <application>Evolution</application> as a whole, and others 
-            the way a particular kind of information appears.
-          </para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term> <guimenu>Settings</guimenu> Menu </term>
-          <listitem><para> Tools for configuring, changing, and
-          setting up go here.  For mail, that means things like
-          <guimenuitem>Mail Configuration</guimenuitem> and the
-          <guimenuitem>Virtual Folder Editor</guimenuitem>.  For the
-          <interface>Calendar</interface> and the <interface>Contact
-          Manager</interface>, it's color, network, and layout
-          configuration. </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>Help</guimenu> Menu</term>
-          <listitem><para>
-             Select among these items to open the 
-             <application>Help Browser</application> 
-             and read the <application>Evolution</application> manual.
-          </para></listitem>
-        </varlistentry>
-      </variablelist>
-   </para>
-   <para>
-     Other menus, like <guilabel>Folder</guilabel>,
-     <guilabel>Message</guilabel>, and <guilabel>Actions</guilabel>,
-     appear only occasionally.  <guilabel>Message</guilabel> and
-     <guilabel>Folder</guilabel>, for example, have commands that only
-     relate to email, so they're only available when you're looking at
-     email.
-   </para>
-   <para>
-      Once you've familiarized yourself with the <interface>main
-      window</interface> you can start doing things with it.  We'll
-      start with your email inbox, since you've got a letter waiting
-      for you already.
-    </para>
-  </sect1>
-</chapter>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/help/es/usage-notes.sgml b/help/es/usage-notes.sgml
deleted file mode 100644
index fb4e3289b2..0000000000
--- a/help/es/usage-notes.sgml
+++ /dev/null
@@ -1,49 +0,0 @@
-<chapter id="usage-notes">
-  <title>Notas de Evolution</title>
-  <abstract>
-    <title> Una Vista General de las Notas de Evolution</title>
-    <para>
-      En la edad oscura antes de que el correo electrónico fuera inventado,
-      habia pequeños trozos de papel que la gente usaba para guardar
-      información que se necesitaba durante poco tiempo. A estos trozos de
-      papel se les llamó notas.  Ahora, las notas son casi una parte
-      necesaria de nuestras vidas, aunque ahora en formato electrónico.
-      Tiene sentido, entonces, que <application>Evolution</application>
-      eventualmente tenga una función de notas.
-      <application>Evolution</application> le ayuda a tomar notas de la
-      siguientes formas:
-     <itemizedlist>
-       <listitem>
-         <para>
-           Apunte números de teléfono, notas de la escuela, tome notas de
-	   mensajes telefónicos, o incluso escriba poesía.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Un código de colores para las notas pra poder organizarlas, o
-           simplemente para que tengan una apariencia bonita.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Convierta una nota en un mensaje electrónico o en un archivo de texto.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Escriba <glossterm>Haiku</glossterm>
-         </para>
-       </listitem>
-     </itemizedlist>
-   </para>
-   <para>
-     Puede comenzar a escribir notas pulsando sobre
-     <guibutton>Notas</guibutton> en la barra de atajos.  Naturalmente,
-     todavia no está ahí. Pero cuando esté, le llevara al editor.
-   </para>
-  </abstract>
-</chapter>
-
-
-
diff --git a/help/es/usage-print.sgml b/help/es/usage-print.sgml
deleted file mode 100644
index ef5b501f8e..0000000000
--- a/help/es/usage-print.sgml
+++ /dev/null
@@ -1,104 +0,0 @@
-<chapter id="usage-print">
-<title>Imprimiendo con Evolution</title>
-<para>
-  Este es un capítulo muy corto, porque imprimir con
-  <application>Evolution</application> no es unatarea complicada.  Como
-  la mayoría de las aplicaciones GNOME, <application>Evolution</application>
-  usa el sistema gnome-print, así que si ha usado otra aplicación GNOME
-  para imprimir, debería sera capaz de imprimir inmeditamente en
-  <application>Evolution</application>.
-</para>
-<para>
-  Tanto si esta imprimiendo un mensaje, una pagina del  calendario, o una
-  selección de tarjetas de visita, puede elegir entre imprimirlo directamente
-  en la impresora, o guardar la salida de la impresión en un archivo
-  postscript.  También puede usar la característica de vista previa para ver
-  como será la salida.
-</para>
-
-  <sect1 id="printpreview">
-    <title>Vista Previa de la Impresión</title>
-    <para>
-      <guibutton>Vista Previa</guibutton> aparece como un botón en
-      el diálogo de impresión y como una opción en el menú
-      <guimenu>Archivo</guimenu>.  En ambos sitios, hace lo mismo:
-      abre una nueva ventana que le muestra que pasaría si imprimiese
-      el mensaje, el calendario, la cita, o la tarjeta de actual.
-    </para>
-    <para>
-      Esa ventana le permite sleccionar que páginas quiere ver,
-      y como de cerca quiere verlas.  Aumentar o disminuir el zoom,
-      ajustar la página a la ventana (el botón <guibutton>Ajustar</guibutton>)
-      o igualar el ancho del papel con el de la ventana (el botón
-      <guibutton>Ajustar Ancho</guibutton>).  Ninguno de estos botones
-      modifica la manera en que se imprimen las páginas, pero le permiten
-      verlas mejor.  Si está satisfecho con el aspecto que tienen, pulse
-      <guibutton>Imprimir</guibutton> para enviar su documento a su destino.
-      Si quisiera cambiarlo, cierre la ventana de la
-      <guilabel>Vista Previa</guilabel> y haga los cambios que quiera
-      en el Correo, el Calendario, o el Administrador de Contactos.
-    </para>
-
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="print-preview">
-	  <title>Vista Previa de la Impresión</title>
-	  <screenshot>
-	    <screeninfo>Print Preview</screeninfo>
-	    <graphic fileref="fig/print-preview" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-  </sect1>
-
-  <sect1 id="print-destination">
-    <title>¿Archivo o Impresora?</title>
-    <para>
-       La ventana de selección de impresora, mostrada en <xref
-       linkend="print-dest">, le permite elegir el formato de
-       impresión&mdash; en estos momentos, solo está disponible
-       <guilabel>Postscript Genérico</guilabel>&mdash; y si imprimir a un
-       archivo o a una impresora.  Si elige una impresora,
-       le pedirá el comando que use su sistema para la impresora
-       (probablemente <guilabel>lpr</guilabel>).  Si decide imprimir en un
-       archivo, debe decidir el nombre.  Y naturalmente, debe decidor el
-       número de copias, y si deben ir o no intercaladas.
-    </para>
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="print-dest">
-	  <title>Eligiendo una Impresora</title>
-	  <screenshot>
-	    <screeninfo>Choosing a Printer</screeninfo>
-	    <graphic fileref="fig/print-dest" format="png" srccredit="Aaron Weber">
-	</graphic>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-   <para>
-     Si está imprimiendo un mensaje que ocupa más de una página, tiene la
-     opción de elegir que páginas imprimir.  Si está imprimiendo las
-     entradas de un calendario, puede decidir el rango de fechas a imprimir.
-     Y, si está imprimiendo tarjetas, puede decidir si imprimir solo las
-     seleccionadas, o todas ellas.
-   </para>
-    <para>
-     Cuando este listo, pulse <guibutton>Imprimir</guibutton> para imprimir,
-     <guibutton>Vista Previa</guibutton> para echar un vistazo (u otro más)
-     a la vista previa, o <guibutton>Cancelar</guibutton> para cancelarlo
-     todo.
-    </para>
-  </sect1>
-</chapter>
-
-
-
-
-
-
-
diff --git a/help/es/usage-sync.sgml b/help/es/usage-sync.sgml
deleted file mode 100644
index 878406c4b6..0000000000
--- a/help/es/usage-sync.sgml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-    <chapter id="usage-sync">
-      <title>Sincronizando con un Dispositivo de mano</title>
-      <para>
-        Este capítulo cubre como sincronizar datos una vez instalado y 
-        configurado.  Si necesita información sobre como preparar un
-        sistema de sincronización, consulte <xref
-        linkend="config-sync">.
-      </para>
-      <sect1 id="hotsync">
-        <title>Usando la Sincronización</title>
-        <para>
-          Ponga su dispositivo de mano en su cuna y apriete el botón
-          de sincronización.
-        </para>
-        <para>
-         No, de verdad.  Esto es todo lo que hay que hacer.
-        </para>
-       </sect1>
-    </chapter>
\ No newline at end of file
diff --git a/help/no/.cvsignore b/help/no/.cvsignore
deleted file mode 100644
index 11bc8ea04b..0000000000
--- a/help/no/.cvsignore
+++ /dev/null
@@ -1,9 +0,0 @@
-Makefile
-Makefile.in
-*.log
-*.ps
-*.dvi
-*.tex
-evolution
-index.html
-omf_timestamp
\ No newline at end of file
diff --git a/help/no/ChangeLog b/help/no/ChangeLog
deleted file mode 100644
index 31603e8eab..0000000000
--- a/help/no/ChangeLog
+++ /dev/null
@@ -1,13 +0,0 @@
-2002-06-27  Aaron Weber  <aaron@ximian.com>
-
-	* evolution-no.omf: apply patch from otaylor
-
-2001-10-22  Ettore Perazzoli  <ettore@ximian.com>
-
-	* topic.dat: s/usage-exec-summary.html/usage-summary.html/.
-
-2001-08-21  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* ChangeLog: Added this here.
-	* topic.dat:: Norwegian version.
-	
\ No newline at end of file
diff --git a/help/no/Makefile.am b/help/no/Makefile.am
deleted file mode 100644
index 56df841020..0000000000
--- a/help/no/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-figs = \
-	figures/calendar.png			\
-	figures/config-cal.png			\
-	figures/config-mail.png			\
-	figures/contact-editor.png		\
-	figures/contact.png			\
-	figures/filter-assist-fig.png		\
-	figures/filter-new-fig.png		\
-	figures/full-1.png			\
-	figures/full-2.png			\
-	figures/full-3.png			\
-	figures/full-4.png			\
-	figures/full-5.png			\
-	figures/full-6.png			\
-	figures/full-7.png			\
-	figures/mail-composer.png		\
-	figures/mail-druid-pic.png		\
-	figures/mail-inbox.png			\
-	figures/mainwindow-pic.png		\
-	figures/newmsg.png			\
-	figures/print-dest.png			\
-	figures/print-preview.png		\
-	figures/replymsg.png			\
-	figures/vfolder-createrule-fig.png
-docname = evolution
-lang = no
-omffile = evolution-no.omf
-sgml_ents = \
-	apx-authors.sgml	\
-	apx-bugs.sgml		\
-	apx-gloss.sgml		\
-	config-encryption.sgml	\
-	config-prefs.sgml	\
-	config-sync.sgml	\
-	evolution-faq.sgml	\
-	menuref.sgml		\
-	preface.sgml		\
-	usage-calendar.sgml	\
-	usage-contact.sgml	\
-	usage-encryption.sgml	\
-	usage-exec-summary.sgml	\
-	usage-mail-org.sgml	\
-	usage-mail.sgml		\
-	usage-mainwindow.sgml	\
-	usage-print.sgml	\
-	usage-sync.sgml
-	
-include $(top_srcdir)/help/sgmldocs.make
-dist-hook: app-dist-hook
diff --git a/help/no/apx-authors.sgml b/help/no/apx-authors.sgml
deleted file mode 100644
index a48a8c30ff..0000000000
--- a/help/no/apx-authors.sgml
+++ /dev/null
@@ -1,98 +0,0 @@
-  <appendix id="authors">
-    <title>Forfattere</title>
-     <para>
-      <application>Evolution</application> er skrevet av:
-<simplelist>
-     <member>Seth Alves: <email>alves@ximian.com</email></member>
-     <member>Anders Carlsson: <email>andersca@gnu.org</email></member>
-     <member>Damon Chaplin: <email>damon@ximian.com</email></member>
-     <member>Clifford R. Conover: <email>rusty@zootweb.com</email></member>
-     <member>Anna Dirks: <email>anna@ximian.com</email></member>
-     <member>Miguel De Icaza: <email>miguel@ximian.com</email></member>
-     <member>Radek Doulik: <email>rodo@ximian.com</email></member>
-     <member>Arturo Espinoza: <email>arturo@nucleu.unam.mx</email></member>
-     <member>Larry Ewing: <email>lewing@ximian.com</email></member>
-     <member>Nat Friedman: <email>nat@ximian.com</email></member>
-     <member>Bertrand Guiheneuf: <email>bertrand@ximian.com</email></member>
-     <member>Iain Holmes: <email>iain@ximian.com</email></member>
-     <member>Tuomas Kuosmanen: <email>tigert@gimp.org</email></member>
-     <member>Christopher J. Lahey: <email>clahey@ximian.com</email></member>
-     <member>Jason Leach: <email>jleach@usa.net</email></member>
-     <member>Matthew Loper: <email>matt@loper.org</email></member>
-     <member>Federico Mena: <email>federico@ximian.com</email></member>
-     <member>Rodrigo Moya: <email>rodrigo@ximian.com</email></member>
-     <member>Eskil Heyn Olsen: <email>deity@eski.dk</email></member>
-     <member>Jesse Pavel: <email>jpavel@ximian.com</email></member>
-     <member>Ettore Perazzoli: <email>ettore@ximian.com</email></member>
-     <member>Jeffrey Stedfast: <email>jeff@ximian.com</email></member>
-     <member>Jakub Steiner: <email>jimmac@ximian.com</email></member>
-     <member>Russell Steinthal: <email>rms39@columbia.edu</email></member>     
-     <member>Peter Teichman: <email>peter@ximian.com</email></member>     
-     <member>Chris Toshok: <email>toshok@ximian.com</email></member>
-     <member>Peter Williams: <email>peter@newton.cx</email></member>
-     <member>Dan Winship: <email>danw@ximian.com</email></member>
-     <member>Michael Zucchi: <email>notzed@ximian.com</email></member>
-</simplelist>
-og andre dedikerte GNOME-programmerere. 
-</para>
-    <para>
-       <application>Evolution</application>-koden står i stor gjeld
-       til <application>GNOME-pim</application> og
-       <application>GNOME-Calendar</application> applikasjonene, og til
-       <application>KHTMLW</application>. <application>Evolution</application>-
-       utviklerene er takknemlige for innsatsen og bidragene fra alle
-       som har arbeidet på disse prosjektene.
-    </para>
-
-
-    <para>
-      Ximian ønsker å takke Miles Lane for sin innsats med
-      kvalitetssikring av produktet og staben på El Pelon Taqueria,
-      på Peterborough st. i Boston for substans.
-    </para>
-    
-    
-    <para>
-      For mer informasjon vennligst besøk
-      <application>Evolution</application> <ulink
-      url="http://www.ximian.com/products/ximian_evolution/"
-      type="http">nettsiden</ulink>. Vær vennlig og send alle
-      kommentarer, forslag og feilrapporter til <ulink
-      url="http://bugzilla.gnome.org" type="http">GNOME feilrapporterings-
-      databasen</ulink>. Instruksjoner for innsending av feilrapporter kan
-      finnes på nettet på <ulink
-      url="http://bugzilla.gnome.org/bugwritinghelp.html" type="http">
-      http://bugzilla.gnome.org/bugwritinghelp.html</ulink>. Du kan også bruke
-      kommandoen <command>bug-buddy</command> for å sende inn feilrapporter.
-    </para>
-    
-    <para>
-      Denne brukerhåndboken er skrevet av Aaron Weber
-      (<email>aaron@ximian.com</email>), Kevin Breit
-      (<email>battery841@mypad.com</email>) Duncan Mak
-      (<email>duncan@ximian.com</email>) og Ettore Perazzoli
-      (<email>ettore@ximian.com</email>) med hjelp fra 
-      applikasjonsprogrammererene og GNOME Documentation Project.
-      Vennligst legg inn alle kommentarer og forslag angående brukerhåndboken
-      som feilrapporter i Ximian's feilhåndteringssystem. Hvis du har
-      hjulpet dette prosjektet, men ikke ser ditt navn nevnt her, kan
-      du kontakte Aaron Weber (<email>aaron@ximian.com</email>), så vil
-      han legge deg til i listen.
-    </para>
-      <para>
-       Oversettelser: 
-         <itemizedlist>
-            <listitem><para>
-              Daniel Persson for .se
-            </para></listitem>
-          
-            <listitem><para>
-              Hector Garcia Alvarez for .es
-            </para></listitem>
-	    
-	    <listitem><para>
-	      Kjartan Maraas for .no
-	    </para></listitem>
-           </itemizedlist>
-         </para>          
-    </appendix>
diff --git a/help/no/apx-bugs.sgml b/help/no/apx-bugs.sgml
deleted file mode 100644
index aae4fde936..0000000000
--- a/help/no/apx-bugs.sgml
+++ /dev/null
@@ -1,38 +0,0 @@
- <appendix id="bugs">
-   
-    <title>Kjente feil og begrensninger</title>
-    <abstract>
-    <para>
-     Feilhåndtering for Ximian Evolution gjøres i <ulink
-    url="http://bugzilla.ximian.com">Ximian's feilhåndteringssystem
-    </ulink> Du kan bruke dette, eller GNOME's <application>
-    feilrapporteringsverktøy</application> (kjent som
-    <command>bug-buddy</command> på kommandolinjen) hvis du finner feil
-    eller ønsker å be om nye funksjoner.
-    </para>
-    <para>
-      Hvis du trenger mer hjelp med Ximian Evolution kan du besøke
-      Ximian's nettsted for brukerstøtte på <ulink
-      url="http://support.ximian.com">ximian.com/support</ulink>.
-    </para>
-    </abstract>
-
-    <para>
-      Et antall ofte etterspurte funksjoner vil ikke bli inkludert i
-      Ximian Evolution 1.0, men vi planlegger å inkludere dem i versjon
-      1.1. Noen av dem er:
-    <simplelist>
-    <member>Direkte import av kontakter fra Microsoft Outlook</member>
-    <member>Synkronisering av epost med håndholdte enheter</member>
-    <member>Støtte for S/MIME</member>
-    <member>Lesing av eksterne e-postmapper uten å importere dem</member>
-    <member>Import av WINMAIL.DAT vedlegg</member>
-    <member>Avspilling av en lyd for å indikere innkommende meldinger</member>
-    </simplelist>
-    </para>
-    <para>
-      En mer komplett liste over forespørsler etter funksjoner og andre
-      saker er tilgjengelig på nett i Ximian's feilhåndteringssystem.
-    </para>
-  </appendix>
-
diff --git a/help/no/apx-gloss.sgml b/help/no/apx-gloss.sgml
deleted file mode 100644
index e81f906ce3..0000000000
--- a/help/no/apx-gloss.sgml
+++ /dev/null
@@ -1,419 +0,0 @@
-<glossary id="apx-gloss">
-
- <title>Ordliste</title>
-
- <glossentry id="attachment">
-  <glossterm>Vedlegg:</glossterm>
-  <glossdef>
-   <para>
-    Enhver fil som sendes med en melding. Vedlegg kan ligge i selve
-    meldingen eller ligge som et tillegg.
-   </para>
-  </glossdef>
- </glossentry>
-
-<glossentry id="automatic-indexing">
-  <glossterm>Automatsk indeksering:</glossterm>
-  <glossdef>
-   <para>
-     Forhåndssorteringsprosedyre som lar
-     <application>Evolution</application> referere til data raskt.
-     Det muliggjøre raskere søk og reduserer minnebruk for
-     datavisninger.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="bcc">
-  <glossterm>Bcc (Blind Carbon Copy):</glossterm>
-  <glossdef>
-   <para>
-    En måte å adressere en melding. Bcc brukes for å sende en melding
-    til en gruppe mennesker, men samtidig skjule deres navn og e-postadresser
-    fra hverandre.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="cc">
-  <glossterm>Cc (Carbon Copy):</glossterm>
-  <glossdef>
-   <para>
-    Karbonkopier brukes for å sende en tredjepart en kopi av en melding
-    slik at de kan holdes oppdatert i konversasjonen uten å være på
-    mottakerlisten.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="conduit">
-  <glossterm>Conduit:</glossterm>
-  <glossdef>
-   <para>
-     En synkroniseringskomponent er en liten applikasjon som kontrollerer
-     overføring av data mellom en håndholdt enhet og en annen datamaskin.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="druid">
-  <glossterm>Druide:</glossterm>
-  <glossdef>
-   <para>
-    Et verktøy som leder en bruker gjennom en serie steg, vanligvis for
-    å konfigurere eller sette opp et program. Samme som "Assisten" og
-    "Veiviser".
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="evolution">
-  <glossterm>Evolution:</glossterm>
-  <glossdef>
-   <para>
-    <application>Evolution</application> er <acronym> GNOME's
-    </acronym> gruppevareapplikasjon.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="execute">
-  <glossterm>Kjør:</glossterm>
-  <glossdef>
-   <para>
-    Det å kjøre et program. Enhver fil som kan kjøres kalles
-    kjørbar fil. <application>Evolution</application> kan laste ned
-    kjørbare vedlegg, men før disse kan kjøres, må filene merkes som
-    kjørbare via skallet eller en filhåndterer. Dette er gjort som
-    et sikkerhetstiltak for å hindre automatisk eller tilfeldig kjøring
-    av ondsinnede programmer. For mer informasjon om kjørbare filer og
-    filrettigheter, se dokumentasjonen for din filhåndterer eller skall.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="expunge">
-  <glossterm>Tøm:</glossterm>
-  <glossdef>
-   <para>
-     Når meldinger merkes for sletting vil de bli værende til de tømmes.
-     Når en melding tømmes vil den bli slettet permanent hvis den var merket
-     for sletting.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="filetree">
-  <glossterm>Filtre:</glossterm>
-  <glossdef>
-   <para>
-     En måte å beskrive en gruppe med filer på en datamaskin. Som et
-     resultat av datamaskinens litt fordreide syn på virkeligheten
-     blir toppen av treet kalt rotkatalogen, og vises med
-     <filename>/</filename>.
-     Resten av grenene sprer seg nedover fra roten. Ikke forveksle
-     rotkatalogen med kontoen til root (superbruker),
-     eller hjemmekatalogen til root,
-     <filename>/root</filename>.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="filter">
-  <glossterm>Filter:</glossterm>
-  <glossdef>
-   <para>
-    I <application>Evolution</application>, er et filter en metode
-    for automatisk sortering av meldinger. Du kan opprette filtre for å utføre
-    en eller flere handlinger på en melding som møter ethvert (eller alle)
-    av et bredt utvalg av kriterier.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="forward">
-  <glossterm>Videresend:</glossterm>
-  <glossdef>
-   <para>
-    Hvis du mottar en melding som var ment for noen andre kan du bruke
-    videresending for å sende den til riktig person. 
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="groupware">
- <glossterm>Gruppevare:</glossterm>
-  <glossdef>
-   <para>
-    Gruppevare er et uttrykk som beskriver en applikasjon som hjelper grupper
-    av mennesker å arbeide sammen. En gruppevareapplikasjon vil typisk
-    ha flere produktivitetsfunksjoner innebygget i ett program,
-    inkludert e-post, kalender, og adressebok.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="html">
-  <glossterm>HTML:</glossterm>
-  <glossdef>
-   <para>
-    Hyper-text Markup Language (<acronym>HTML</acronym>) er et språk
-    for å beskrive utseende i elektroniske dokumenter som nettsider,
-    hjelpfiler, og e-postmeldinger.  HTML kan brukes til å sette inn
-    bilder og endre utseende på tekst i e-post og diskusjonsgruppeinnlegg.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="hot-key">
-  <glossterm>Hurtigtast:</glossterm>
-  <glossdef>
-   <para>
-    Hurtigtaster er tastaturkombinasjoner som brukes for å utføre handlinger
-    på datamaskinen uten å bruke musen for å gjøre samme handling.
-    Hurtigtaster kan gjøre bruken av datamaskinen raskere.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="ical">
-  <glossterm>iCal:</glossterm>
-  <glossdef>
-   <para>
-    <application>iCal</application> er programmet som
-    <application>Evolution</application> bruker for å håndtere kalenderen
-   </para>
-  </glossdef>
- </glossentry> 
-
- <glossentry id="imap">
-  <glossterm>IMAP:</glossterm>
-  <glossdef>
-   <para>
-    Avhengig av hvem du spør, vil du høre at IMAP står for Internet
-    Mail Access Protocol, eller Interim Mail Access Protocol. Uansett hva det
-    står for gir det tilgang til e-post, vanligvis (men ikke
-    alltid) lagret eksternt på en tjener i stedet for på en lokal
-    harddisk.  I motsetning til <glossterm>POP:</glossterm>.
-    Dette vil ikke komme på prøven.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="inline">
-  <glossterm>Innfelt:</glossterm>
-  <glossdef>
-   <para>
-     Vises som en del av en melding eller annet dokument, i stedet for som
-     en separat fil. I motsetning til <glossterm
-     linkend="attachment">Vedlegg:</glossterm>.
-   </para>
-  </glossdef>
- </glossentry>
- 
-  <glossentry id="ldap">
-   <glossterm>LDAP:</glossterm>
-   <glossdef>
-    <para>
-     LDAP, Lightweight Directory Access Protocol, lar en klient
-     søke gjennom en stor database med adresser, telefonnummer, og
-     mennesker, som er lagret på en tjener.
-    </para>
-   </glossdef>
-  </glossentry>
-
- <glossentry id="mail-client">
-  <glossterm>E-postklient:</glossterm>
-  <glossdef>
-   <para>
-    En e-postklient er applikasjonen som en person bruker for å lese og
-    sende e-post. I motsetning til forskjellige typer e-posttjenere,
-    som håndterer autentisering av brukere og dirigerer meldinger fra
-    avsender til mottaker.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="minicard">
-  <glossterm>Minikort:</glossterm>
-  <glossdef>
-   <para>
-      Et format for visning av kontaktdata. Likt i utseende til et lite
-      visittkort.
-   </para>
-  </glossdef>
- </glossentry> 
-
- <glossentry id="nautilus">
-  <glossterm>Nautilus:</glossterm>
-  <glossdef>
-   <para>
-    <application>Nautilus</application> er neste generasjon
-    filhåndterer for <acronym>GNOME</acronym> skrevet av tidligere Eazel
-    med flere.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="pop">
-  <glossterm>POP:</glossterm>
-  <glossdef>
-   <para>
-     POP, Post Office Protocol, er en mekanisme for transport
-     av e-post. I motsetning til IMAP, brukes denne kun for å hente meldinger
-     fra en tjener og lagre den lokalt på din egen harddisk.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="protocol">
-  <glossterm>Protokoll:</glossterm>
-  <glossdef>
-   <para>
-     En akseptert kommunikasjonsmetode, spesielt for sending av
-     bestemte typer informasjon mellom datamaskinsystemer.
-     Eksempler inkluderer POP (Post Office Protocol), for e-post, og HTTP
-     (HypterText Transfer Protocol), for nettsider.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="public-key-encryption">
-  <glossterm>Public Key Encryption:</glossterm>
-  <glossdef>
-   <para>
-     En sterk krypteringsmetode som bruker et sett med to "nøkler", en
-     offentlig og en som holdes privat. Data som krypteres med den
-     offentlige nøkkelen kan kun dekrypteres med den private nøkkelen.
-     Dess lengre nøklene er jo vanskeligere er det å bryte krypteringen.
-   </para>
-  </glossdef>
- </glossentry>
-
-
-
- <glossentry id="regular-expression">
-  <glossterm>Vanlig uttrykk:</glossterm>
-  <glossdef>
-   <para>
-      Et regulært uttrykk, eller "regex", er en måte å beskrive en
-      tekststreng ved bruk av metategn eller jokertegn. For eksempel,
-      uttrykket <userinput>fly.*so[a|u]p</userinput> betyr
-      "enhver frase som begynner med 'fly' og slutter med 'soup' eller
-      'soap'".  Hvis du søker etter dette uttrykket, vil du finne både
-      "fly in my soup" og "fly in my soap."  Det er ikke tid til å gå
-      i dybden her, men hvis du ønsker det kan du se på dokumentasjonen
-      for <command>grep</command>-kommandoen.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="script">
-  <glossterm>Skript:</glossterm>
-  <glossdef>
-   <para>
-    Et program skrevet i et fortolket (ikke kompilert)
-    språk. Brukes ofte som et synonym for "makro," for å beskrive en rekke
-    med forhåndsinspilte kommandoer eller handlinger i en applikasjon.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="sendmail">
-  <glossterm>Sendmail:</glossterm>
-  <glossdef>
-   <para>
-      Som navnet hentyder, er <application>sendmail</application> et
-      program som sender e-post. <application>Evolution</application>
-      kan bruke dette istedet for <glossterm>SMTP:</glossterm>; noen
-      foretrekker dette fordi det gir større grad av fleksibilitet, men
-      det er vanskeligere å konfigurere.
-   </para>
-  </glossdef>
- </glossentry>
-
-
- <glossentry id="shortcut-bar">
-  <glossterm>Snarveilinje:</glossterm>
-  <glossdef>
-   <para>
-     En del av <application>Evolution</application> som gir brukere
-     rask tilgang til de mest brukte delene av applikasjonen.
-   </para>
-  </glossdef>
- </glossentry>
-
-  <glossentry id="signature">
-   <glossterm>Signatur:</glossterm>
-   <glossdef>
-    <para>
-     I e-post-terminologien er en signatur et stykke tekst plassert ved
-     slutten av alle meldinger som sendes, på samme måte som en håndskrevet
-     signatur i et brev. En signatur kan være alt fra et favorittsitat
-     til en lenke til en nettside; av hensyn til andre er normen at den
-     ikke skal være lengre enn fire linjer.
-    </para>
-   </glossdef>
-  </glossentry> 
-
-  <glossentry id="SMTP">
-   <glossterm>SMTP:</glossterm>
-   <glossdef>
-    <para>
-      Dette er den vanligste måten å transportere e-postmeldinger fra
-      klientens datamskin (deg) til tjeneren. SMTP står for
-      Simple Mail Transfer Protocol.
-    </para>
-   </glossdef>
-  </glossentry> 
-
- <glossentry id="tooltip">
-  <glossterm>Verktøytips:</glossterm>
-  <glossdef>
-   <para>
-      En liten boks med forklarende tekst som vises når muspekeren
-      holdes i ro over en knapp eller en annen del av
-      brukergrensesnittet.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="virus">
-  <glossterm>Virus:</glossterm>
-  <glossdef>
-   <para>
-    Et program som legger seg selv til andre filer eller programmer og
-    som, når det kjøres, sprer seg til flere programmer og andre
-    datamaskiner. Et virus kan forårsake stor skade ved å bruke
-    båndbredde, diskplass, slette filer, eller åpne sikkerhetshull.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="vcard">
-  <glossterm>vCard:</glossterm>
-  <glossdef>
-   <para>
-    Et filformat for utveksling av kontaktinformasjon. Når du mottar
-    et adressekort vedlagt i en melding, er det sannsynligvis i vCard-
-    format. Ikke til forveksling med <glossterm
-    linkend="vfolder">vFolder:</glossterm>.
-   </para>
-  </glossdef>
- </glossentry>
-
- <glossentry id="vfolder">
-  <glossterm>vFolder:</glossterm>
-  <glossdef>
-   <para>
-    Et verktøy for organisering av meldinger. vFoldere lar deg opprette en
-    mappe som inneholder resultatet av et komplekst søk. vFolder-innhold
-    oppdateres dynamisk.
-   </para>
-  </glossdef>
- </glossentry>
-
-</glossary>
diff --git a/help/no/config-encryption.sgml b/help/no/config-encryption.sgml
deleted file mode 100644
index e36f17c652..0000000000
--- a/help/no/config-encryption.sgml
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE article PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[]>
-
-<article>
-  
-  <sect1 id="encryption-intro">
-    <title>What is Encryption?</title>
-    <para>
-      Encryption is an ancient method of changing readable text to unreadable
-      text that dates back to Egyptian times.  Encryption takes the statement
-      "Evolution" and turns it into something which cannot be read without help
-      through decryption.
-      <example>
-	<title>Encryption Example</title>
-	<para>
-	  Kevin orders an <application>Evolution</application> t-shirt from
-	  Ximian, Inc. over the internet.  He puts in his credit card number
-	  which is 1234-567-8901.  For security, his computer encrypts the
-	  credit card number so it can be safely transmitted over the internet.
-	  The number now is @#$23ui7yr87#@!48970fsd, which holds no intentional
-	  resemblance to the inital number.  When the information gets to
-	  Ximian, Inc. it'll be decrypted into the inital number.
-	</para>
-      </example>
-      Encryption can be used in email in two ways: to verify that the sender is
-      the real sender, and to hide the message while in transmission.
-      <application>Evolution</application> has the capability to do both.  
-    </para>
-  </sect1>
-  <sect1 id="generating-key">
-    <title>Generating your PGP key</title>
-    <para>
-      First, you need to create a PGP key.  To do this, you'll need GPG
-      installed.
-    </para>
-    <tip>
-      <title>GPG Versions</title>
-      <para>
-	This manual covers version 1.0.6 of GPG.  If your version is different,
-	this may not be entirely accurate.  You may find out your version number
-	by typing in: <command>gpg --version</command>.
-	</para>
-      </tip>
-    <para>
-      You can start by typing in: <command>gpg --gen-key</command>.  At the
-      first question, select 1.  The next question asks you about key length.
-      The longer the key, more stronger it is.  However, the longer the key, the
-      longer it takes to generate.  This is your choice.  However, 1024 bits
-      (default) should be adequate.  The next question asks you if you want your
-      key to expire.  Expiring keys make your key invalid after a certain amount
-      of time, so old keys don't float around active.  This is the same concept
-      as a coupon at a supermarket.  Next, you'll type in your Real name, your
-      email address, and a comment.  You should not forge this information, as
-      it is used later to verify who you are.  Assuming that all your
-      information is correct, press "O" to continue.  GPG now asks you for a
-      passphrase.  This is a password which you will need to decrypt and encrypt
-      messages.  This can be any length, with any characters in it.  It is case
-      sensitive, which means that it does know the difference between capital
-      letters and lower-case.  Now your key is generated.  It is recommend you
-      surf the internet, read your email, or write a letter in a word
-      processor.  This help creates randomness in the key.
-    </para>
-    <para>
-      Once this is completed, you'll be dropped back to the command line.
-      Now you can view your key information by typing <command>gpg
-      --list-keys</command>.  You should see something similar to this:
-      <example id="gpg-list-keys">
-	<title>GPG Listing Keys</title>
-	<para>
-	  /home/bob/.gnupg/pubring.gpg
-	  ----------------------------
-	  pub 1024D/32j38dk2 2001-06-20 bob &lt;bob@bob.com&gt;
-	  sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]
-	</para>
-      </example>
-      You'll now need to upload your public key to a keyserver, so that your
-      friends can use your key.  You'll need to know the ID of your key, which
-      is after the 1024D on the line beginning with pub.  For this example, it
-      is 32j38dk2.  You now type in <command>gpg --send-keys --keyserver
-      wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for 32j38dk2.
-      You will be prompted to type in your password <!-- verify that you need to
-      enter your password here --> and your key will be uploaded for your
-      friends to download.
-    </para>
-  </sect1>
-  <sect1 id="encrypt-evo-integ">
-    <title>Setting up Evolution's Encryption</title>
-    <para>
-      You'll need to open
-      <menuchoice>
-	<guimenu>Tools</guimenu>
-	<guimenuitem>Mail Settings</guimenuitem>
-      </menuchoice>
-     Once there, select the account you'd like to associate the key to and click
-     the <guibutton>Edit</guibutton> button.  In the
-     <guilabel>Security</guilabel> tab is a section labeled <guilabel>Pretty
-     Goog Privacy</guilabel>.  Enter your key ID and click
-     <guibutton>OK</guibutton>.  Your key is now integrated into your identity
-     in <application>Evolution</application>.
-    </para>
-  </sect1>
-  <sect1 id="encrypt-sending">
-    <title>Sending Encrypted Messages</title>
-    <para>
-      You can either sign or encrypt a message.  When you sign a message, verify
-      that you were the one who sent it, and that no one is forging your
-      identity.  Encrypting a message makes it impossible for someone with
-      prying eyes to view it while it's in tranmission.
-    </para>
-    <para>
-      <sect2 id="sign-msg">
-	<title>Signing a Message</title>
-	<para>
-	  To sign a message, you simply click
-	  <menuchoice>
-	    <guimenu>Security</guimenu>
-	    <guimenuitem>PGP Sign</guimenuitem>
-	  </menuchoice>
-	  .  You will be prompted for your PGP password.  Once you enter it,
-	  click <guibutton>OK</guibutton> and your message will be signed.
-	</para>
-      </sect2>
-      <sect2 id="encrypt-msg">
-	<title>Encrypting a Message</title>
-	<para>
-	  Encrypting a message is very similar to signing a message.  You simply
-	  click the menu item 
-	  <menuchoice>
-	    <guimenu>Security</guimenu>
-	    <guimenuitem>PGP Encrypt</guimenuitem>
-	  </menuchoice>
-	</para>
-      </sect2>
-    </para>
-  </sect1>
-  <sect1 id="unencrypting">
-    <title>Unencrypting a Recieved Message</title>
-    <para>
-      Sometimes, a friend will send you a message which is encrypted.  In order
-      for you to read it, you need to unencrypt it.
-    </para>
-    <para>
-      When you view the encrypted message, <application>Evolution</application>
-      will prompt you for your PGP password.  You type in your PGP password and
-      the message is then decrypted.
-    </para>
-  </sect1>
-  </article>
diff --git a/help/no/config-prefs.sgml b/help/no/config-prefs.sgml
deleted file mode 100644
index 77ebe4e807..0000000000
--- a/help/no/config-prefs.sgml
+++ /dev/null
@@ -1,744 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-<chapter id="config-prefs">
-
-      <title>Advanced Configuration</title>
-      <para>
-        Perhaps your mail server has changed names.  Perhaps you've
-        grown tired of a certain layout for your appointments.
-        Whatever the reason, you want to change your
-        <application>Evolution</application> settings.  This chapter
-        will tell you how to do just that.
-      </para>
-
-       <sect1 id="config-prefs-mail">
-         <title>Mail Settings</title>
-        <para>
-        To change your mail settings, select <menuchoice>
-        <guimenu>Tools</guimenu> <guimenuitem>Mail
-        Settings</guimenuitem></menuchoice> in the Inbox.  This
-        will open the <interface>mail preferences window</interface>,
-        illustrated in <xref linkend="config-prefs-mail-fig">.  Mail
-        preferences are separated into several categories:
-        <variablelist>
-	  <varlistentry>
-	    <term><guilabel>Accounts</guilabel></term>
-	    <listitem>
-	      <para>
-		This allows you to create and alter one or more identities for your
-		email.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Display</guilabel></term>
-	    <listitem>
-	      <para>
-		Allows you to edit how email appears.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Composer</guilabel></term>
-	    <listitem>
-	      <para>
-		Customizes the behavior of the email message composer.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Other</guilabel></term>
-	    <listitem>
-	      <para>
-		Configures miscellanious aspects of
-		<application>Evolution</application> such as character
-		set and encryption tools.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	
-    </para>
-
-      <!-- ==============Figure===================== -->
-      <figure id="config-prefs-mail-fig">
-	<title>Mail Preferences Dialog</title>
-	<screenshot>
-	  <screeninfo>Setting mail preferences</screeninfo>
-	  <mediaobject><imageobject><imagedata fileref="figures/config-mail" format="png" srccredit="Aaron Weber">
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-      <!-- ==============End of Figure================-->
-
-
-    <sect2 id="config-prefs-mail-identity">
-      <title>Working with the Accounts Tab</title> 
-      <para>
-         <application>Ximian Evolution</application> allows you to
-         maintain multiple accounts, or identities.  This is useful
-         want to keep personal and professional email separate, or if
-         you wear several hats at work. When you are writing an email
-         message, you can which account to use by selecting from the
-         drop-down list next to the <guilabel>From</guilabel> entry in
-         the message composer.
-       </para>
-
-       <para>
-         Clicking <guibutton>Get Mail</guibutton> will refresh any
-         IMAP, <filename>mh</filename>, or
-         <filename>mbox</filename> listings
-         and check and download mail from all POP servers.  In other
-         words, <guibutton>Get Mail</guibutton> gets your mail, no
-         matter how many sources you have, or what types they are.  If
-         you don't want to check mail for a given account, select it
-         in the <guilabel>Accounts</guilabel> tab and click the
-         <guibutton>Disable</guibutton> button.
-       </para>
-       
-      <para>
-         To add a new account, simply click <guibutton>Add</guibutton>
-         to open the mail configuration assistant. To alter an
-         existing identity, select it in the
-         <interface>Preferences</interface> window, and then click
-         <guibutton>Edit</guibutton> to open the account editor
-         dialog.
-      </para>
-     <para>
-         The account editor dialog has six sections:
-          <variablelist>
-
-	  <varlistentry> 
-	    <term>Identity:</term>
-           <listitem>
-	    <para>
-              Here, enter the name,
-              email address, and other identifying information for the
-              account.
-            </para>
-	  </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term>Receiving Mail</term>
-           <listitem>
-	    <para>
-             Here, select the way you will be getting mail: you may
-             download mail from a server (<glossterm
-             linkend="pop">POP</glossterm> or <glossterm
-             linkend="imap">IMAP</glossterm>) or access it from files
-             on your local system.  If you use a server, it may permit
-             or require you to use a Secure Socket Layer (SSL)
-             connection.  To turn SSL connections on, just click the
-             <guibutton>Use Secure Connection (SSL)</guibutton>
-             button.
-
-<note id="config-arbitrary-port">
-<title>Specifying Port Numbers</title>
-<para>
-Your system administrator may ask you to connect to a specific port on
-a mail server. To specify which port you use, just type a colon and
-the port number after the server name. For example, to connect to port
-143 on the server smtp.omniport.com, you would enter
-as
-<userinput>
-smtp.omniport.com:143
-</userinput> as the server name.
-</para>
-</note>
-
-	  </para>
-	  </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term>Receiving Options</term>
-           <listitem>
-	    <para>
-              Here, decide whether you'd like to check for mail
-              automatically, and set other options related to the
-              behavior of your server.  If you use POP mail, you can
-              decide whether to leave mail on the server, and if you
-              use IMAP, you can set folder subscription options here.
-            </para>
-	  </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term>Sending Mail</term>
-           <listitem>
-	    <para>
-              In this section, you will choose and configure a method
-              for sending mail.  You may choose <glossterm
-              linkend="smtp">SMTP</glossterm> or <glossterm
-              linkend="sendmail">sendmail</glossterm>.
-             </para>
-	  </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term>Special Folders</term>
-           <listitem>
-	    <para>
-              Here, you can decide where this account will store the
-              messages that it has sent, and the messages that you
-              save as drafts.
-            </para>
-	  </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term>Security</term>
-           <listitem>
-	    <para>
-              In this section, you will set the security options for
-              this account. Enter your PGP Key ID and decide how
-              frequently to encrypt and sign your messages.
-            </para>
-	  </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="config-prefs-mail-display">
-      <title>Mail Display Options</title>
-      <para>
-        In this tab you can decide how you would like
-        <application>Ximian Evolution</application> to display your
-        mail: how to display citations, how long to wait before
-        marking a message as read, and so forth.
-      </para>
-     <para>
-        This is also where you can decide how you would like
-        <application>Ximian Evolution</application> to handle inline
-        images in HTML mail that you get. There is a detailed
-        discussion of the issues surrounding these options in <xref
-        linkend="usage-mail-getnsend-get-attach-html">.
-     </para>
-     <para>
-       To hange the font which <application>Ximian
-        Evolution</application> uses to display mail, do the
-        following:
-       <orderedlist numeration="arabic">
-	  <listitem>
-            <para>
-              Open the Control Center by selecting <menuchoice>
-		<guimenu>System</guimenu>
-		<guimenuitem>Settings</guimenuitem> </menuchoice> from
-		the menu panel.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-               Select the HTML Viewer settings tool.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>Choose the font and font size you would like to use.
-            </para>
-	  </listitem>
-	</orderedlist>
-
-       Alternately, open a terminal and run the
-       <command>gtkhtml-properties-capplet</command> command. This
-       will open the GNOME HTML Display Properties tool, and you can
-       select a font and other attributes of your HTML display,
-       including that in <application>Ximian Evolution</application>.
-     </para>
-     </sect2>
-
-    <sect2 id="config-prefs-mail-composer">
-      <title>Message Composer Preferences</title>
-      
-      <para>
-        Mercifully, there are only four preferences you can prefer in
-        the message composer preferences dialog:
-         <variablelist>
-	  <varlistentry>
-	    <term>Send mail in HTML format by default </term>
-	    <listitem>
-	      <para>
-                 If you would like all email messages that you compose
-                 to begin in HTML format, leave this box checked. You
-                 can convert messages between HTML and plain text by
-                 selecting the <menuchoice> <guimenu>Format</guimenu>
-                 <guimenuitem>HTML</guimenuitem> </menuchoice> toggle
-                 in the message composer.
-               </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Default Forward style</term>
-	    <listitem>
-	      <para>
-                  Select from: 
-                  <simplelist>
-                   <member><guilabel>Attachment:</guilabel> the
-                  message you forward appended to the message you send
-                  as a seperate file.</member>
-
-                  <member> <guilabel>Inline:</guilabel> The message
-                  you forward is included at the end of the message
-                  you send.</member>
-
-		  <member> 
-                     <guilabel>Quoted:</guilabel> The message
-                     you forward is included at the end of the message
-                     you send, and a greater-than symbol (&gt;) is
-                     inserted at the beginning of each line to
-                     indicate that it is quoted.
-                   </member>
-		</simplelist>
-               </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Prompt when sending messages with an empty subject</term>
-	    <listitem>
-	      <para>
-                 The composer will warn you if you try to send a
-                 message without a subject.
-               </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Prompt when sending messages with only Bcc recipients defined</term>
-	    <listitem>
-	      <para>
-                 The composer will warn you if you try to send a
-                 message that has only <guilabel>Bcc</guilabel>
-                 recipients. This is important because some mail
-                 servers will fail to honor blind carbon copy if you
-                 do not have at least one recipient that is visible to
-                 all readers.
-               </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-     <sect2 id="config-prefs-mail-other">
-	<title>Other Mail Preferences</title>
-	<para>
-          Not everything fits neatly into categories.  This tab
-          contains some miscellaneous configuration options that
-          didn't fit anywhere else.
-          <variablelist>
-
-	  <varlistentry>
-	    <term> 
-	      <guilabel>PGP binary path</guilabel>
-	    </term>
-	    <listitem>
-	      <para>
-                The complete path to your external encryption tool On
-                most Linux systems, this will be
-                <filename>/usr/bin/gpg</filename>.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term> 
-	      <guilabel>Remember PGP Passphrase until Exit</guilabel>
-	    </term>
-	    <listitem>
-	      <para> Check this box if you want <application>Ximian
-                Evolution</application> to remember your PGP
-                passphrase for as long as it is running.  You will
-                still have to enter your passphrase again each time
-                you start <application>Ximian Evolution</application>.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>
-	      <guilabel>Default Character Encoding</guilabel>
-	    </term>
-	    <listitem> <para> Choose a default character encoding for
-	      your messages.
-	      </para>
-              </listitem>
-             </varlistentry>
-
-	  <varlistentry>
-	    <term>
-	      <guilabel>Empty Trash Folders on Exit</guilabel>
-	    </term>
-	    <listitem> <para> If you would like to expunge all deleted
-	      mail when you quit <application>Ximian
-	      Evolution</application>, check this box.
-	      </para>
-              </listitem>
-             </varlistentry>
-
-	  <varlistentry>
-	    <term>
-	      <guilabel>Log filter actions to:</guilabel>
-	    </term>
-	    <listitem> <para> If you like, you can have
-	      <application>Ximian Evolution</application> write all
-	      its message filter actions to a log file. Select a log
-	      file here.
-	      </para>
-              </listitem>
-             </varlistentry>
-           </variablelist>
-        </para>
-      </sect2>
-    </sect1>
-
-
-<!-- NOT FOR 1.0, see usage-mail.sgml
-      <sect1 id="config-prefs-news">          
-          <title>News Servers</title>
-          <para>
-            Newsgroups are so much like mailing lists that there's no
-            reason not to keep them right next to your mail.  When you
-            first select the <guilabel>News Servers</guilabel> tab,
-            you will see a blank box with the three familiar buttons
-            on the right: <guibutton>Add</guibutton>,
-            <guibutton>Edit</guibutton>, and
-            <guibutton>Delete</guibutton>.
-          </para>
-          <para>
-            Click <guibutton>Add</guibutton> to add a news server; you
-            will be prompted for its name.  Enter the name, click
-            <guibutton>OK</guibutton>, and you're done.  You can have
-            as many news servers as you like, of course.  News servers
-            will appear next to your IMAP servers in the
-            <interface>folder bar</interface>.
-          </para>
-     </sect2>
--->
-
-
-    <sect1 id="config-prefs-cal">
-       <title>Configuring the Calendar</title>
-       <para>
-          To set your calendar preferences, select
-          <menuchoice><guimenu>Settings</guimenu>
-          <guimenuitem>Calendar
-          Settings</guimenuitem></menuchoice> from the Calendar
-          view.  This will open up the
-          <interface>Preferences</interface> window.  It contains four
-          tabs: <guilabel>General</guilabel>, <guilabel>Display</guilabel>, <guilabel>Task List</guilabel>, and <guilabel>Other</guilabel>.  The <interface>calendar
-          preferences window</interface> is illustrated in <xref
-          linkend="config-prefs-cal-fig">.
-
-      <!-- ==============Figure===================== -->
-      <figure id="config-prefs-cal-fig">
-	<title>Calendar Preferences Dialog</title>
-	<screenshot>
-	  <screeninfo>If this worked on my job as well as my calendar...</screeninfo>
-	  <mediaobject><imageobject><imagedata fileref="figures/config-cal" format="png" srccredit="Aaron Weber">
-	    </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-      <!-- ==============End of Figure================-->
-        </para>
-
-    <sect2 id="config-prefs-cal-general">
-      <title>Calendar's General Settings</title>
-      <para>
-        The <guilabel>Time display</guilabel> tab lets you set the
-        following:
-        <variablelist>
-	  <varlistentry>
-	    <term>Time zone</term>
-	    <listitem>
-	      <para>
-		The city you're located in, to judge your time zone.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Time format</term>
-	    <listitem>
-	      <para>You may choose between twelve-hour (AM/PM) and
-	      twenty-four hour time formats here by clicking the
-	      appropriate radio button.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Work Week</term>
-	    <listitem>
-	      <para>
-                When does your work day start, and when does it end?
-		In the day and week views,
-		<application>Evolution</application> displays all the
-		hours in the range you select here, even if there are
-		no appointments for those times.  Of course, you can
-		still schedule an appointment outside of these hours,
-		and if you do, the display will be extended to show
-		it.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>First day of the week</term>
-	    <listitem>
-	      <para>You can set weeks to start on Sunday or on Monday.</para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Start of day</term>
-	    <listitem>
-	      <para>
-		Says what time of the day your weekday starts.  This will show all times till the end of the day, regardless of there is an appointment during the time period.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>End of day</term>
-	    <listitem>
-	      <para>
-		Sets the time the day ends at.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-       </para>
-    </sect2>
-    <sect2 id="config-prefs-cal-display">
-      <title>Display</title>
-      <para>
-	The <interface>Display</interface> section lets you configure some visual properties of the calendar.
-      </para>
-      <para>The display properties you can set are:
-
-	<variablelist>
-	  <varlistentry>
-	    <term>Time divisions</term>
-	    <listitem>
-              <para>
-		Sets the increments shown on the daily view in the calendar.  You can set this to be:
-		<itemizedlist>
-		  <listitem>
-		    <para>
-		      5 minutes
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      10 minutes
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      15 minutes
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      30 minutes
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      60 minutes
-		    </para>
-		  </listitem>
-		</itemizedlist>
-              </para>
-            </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Show appointment end times in week and month views</term>
-	    <listitem>
-	      <para>
-		If there is space, <application>Evolution</application> will show the end times in the week and month views for each appointment.
-              </para>
-            </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Compress weekends in month view</term>
-	    <listitem>
-	      <para>
-		If checked, your weekends will be shown in one box, instead of one for each day in the month view.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Show week numbers in date navigator</term>
-	    <listitem>
-              <para>
-		This will show the week numbers next to the respective weeks in the calendar.
-	      </para>
-            </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="config-prefs-cal-tasklist">
-      <title>Task List Settings</title>
-     <para>
-       You can choose what information the To Do list displays and the
-       way it is displayed.
-       <variablelist>
-	 <varlistentry>
-	   <term>Tasks due today</term>
-	    <listitem>
-	      <para>
-		Configures what color to set your tasks that are due today to.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Overdue tasks</term>
-	    <listitem>
-	      <para>
-		Configures what color to set your overdue items to.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-
-    <sect2 id="config-prefs-cal-other">
-      <title>Other Calendar Settings</title>
-      <para> 
-	This configures miscellaneous items for the calendar and todo list's functionality.
-	<variablelist>
-	  <varlistentry>
-	    <term>Ask for confirmation when deleting items</term>
-	    <listitem>
-	      <para>
-		When you delete an item in either the Task List or the Calendar, you will be prompted to confirm that you want to delete the item.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Create new appointments with a default reminder</term>
-	    <listitem>
-	      <para>
-		All your appointments will be created using a default reminder enabled.  You can still change what way you are reminded though.  If enabled, you can then set the time before your appointment to be reminded.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect2>
-   </sect1>
-
-   <sect1 id="config-prefs-contact">
-      <title>Managing the Addressbook</title>
-	<para>
-          The addressbook does not have a large list of configuration
-          settings, but those that are there can be found in the
-          <guimenu>Tools</guimenu> menu.
-        </para>
-      
-        <sect2 id="config-prefs-contact-ldap-add">
-           <title>Adding Directory Servers</title>
-           <para>
-              To add a new LDAP server to your available contact
-              folders:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select 
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Addressbook Sources</guimenuitem>
-	      </menuchoice>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>Add</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Enter the server information.
-	      <variablelist>
-		<varlistentry>
-		  <term>Account name</term>
-		  <listitem>
-		    <para>
-		      The name that you see on the screen.  This could be anything you wish.
-		    </para>
-		  </listitem>
-		</varlistentry>
-		<varlistentry>
-		  <term>Server name</term>
-		  <listitem>
-		    <para>
-		      Address of the server where the addressbook is located.
-		    </para>
-		  </listitem>
-		</varlistentry>
-		<varlistentry>
-		  <term>My server requires authentication</term>
-		  <listitem>
-		    <para>
-		      Select this if the server needs a password to access the addressbook.
-		    </para>
-		  </listitem>
-		</varlistentry>
-		<varlistentry>
-		  <term>Port</term>
-		  <listitem>
-		    <para>
-		      The internet port to connect to in order to access the database.  This is normally 389.
-		    </para>
-		  </listitem>
-		</varlistentry>
-		<varlistentry>
-		  <term>Search base</term>
-		  <listitem>
-		    <para>
-		      The base node to use for all your searches.  Contact your administrator for information about setting this up.
-		    </para>
-		  </listitem>
-		</varlistentry>
-		<varlistentry>
-		  <term>Search scope</term>
-		  <listitem>
-		    <para>
-How broad the search is in the directory.
-		    </para>
-		  </listitem>
-		</varlistentry>
-	      </variablelist>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>OK</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>OK</guibutton> to permanenty make changes or <guibutton>Apply</guibutton> to temporarily set the changes.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-  </sect1>
-    
-
-<!--
-  <sect1 id="config-prefs-general">
-    <title>General Preferences</title> 
-    <para>
-      Additional configuration options will be covered here, as
-      they become available.
-    </para>
-  </sect1>
--->
-</chapter>
-    
-
-
-
-
-
diff --git a/help/no/config-sync.sgml b/help/no/config-sync.sgml
deleted file mode 100644
index c6bd2c684c..0000000000
--- a/help/no/config-sync.sgml
+++ /dev/null
@@ -1,126 +0,0 @@
-  <chapter id="config-sync">
-     <title>Oppsett av synkronisering</title> 
-     <para>
-        Synkronisering presenterer to problemer du må håndtere.
-        <simplelist>
-          <member>
-            Din datamaskin må gjenkjenne og godta din håndholdte.
-            For tiden støtter, <application>Ximian Evolution</application>
-            kun Palm-OS enheter som PalmPilot og Handspring Visor.
-          </member>
-          <member>
-           Du må bestemme hvilken oppførsel du ønsker for synkroniseringen.
-          </member>
-        </simplelist>
-    </para>
-
-    <para>
-       Hvis du ikke har brukt en håndholdt enhet mot din datamaskin
-       før må du kjøre GNOME <application>kontrollsenter</application>
-       ved å velge <menuchoice><guimenu>System</guimenu><guimenuitem>
-       Innstillinger</guimenuitem></menuchoice>,
-       og sørge for at <application>Pilot Link</application> er
-       konfigurert på en korrekt måte.
-    </para>
-    <para>
-        Når din datamaskin og din Palm-OS-enhet snakker med hverandre,
-        velg <glossterm
-        linkend="conduit">komponenter</glossterm> du ønsker under
-        <guilabel>Pilot-komponenter</guilabel> seksjonen i kontrollsenteret
-        Du kan bruke komponenter for synkronisering av data mot flere
-        applikasjoner; <application>Ximian Evolution</application>
-        komponentene er merket <guilabel>EAdresse</guilabel>, for
-        kontaktene i din adressebok, <guilabel>EKalender</guilabel>,
-        for din kalender, og <guilabel>EOppgave</guilabel>, for din
-        oppgaveliste.
-    </para>
-   <para>
-      For å aktivere en komponent klikker du
-        <guibutton>Aktiver</guibutton>. Klikk så
-        <guibutton>Innstillinger</guibutton> for å endre oppførsel ved
-        aktivering. Dine valg vil variere avhengig av komponent,
-        men vil typisk være:
-
-        <variablelist>
-         <varlistentry>
-            <term>Deaktivert:</term>
-            <listitem> 
-               <para>
-                  Ikke gjør noe.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Synkroniser:</term>
-            <listitem> 
-               <para>
-                  Kopier nye data fra datamaskinen til den håndholdte og
-                  fra den håndholdte til datamaskinen. Fjern oppføringer
-                  som var på begge systemene men har blitt slettet på
-                  en av dem.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Kopier fra pilot:</term>
-            <listitem> 
-               <para>
-                  Hvis det finnes nye data på den håndholdte enheten,
-                  kopier disse til datamaskinen.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Kopier til pilot:</term>
-            <listitem> 
-               <para>
-                 Kopier nye data fra datamaskinen til den håndholdte. 
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Flett fra pilot:</term>
-            <listitem> 
-               <para>
-                  Kopier nye data fra den håndholdte til datamaskinen, og
-                  fjern all informasjon fra datamaskinen som også er slettet
-                  på den håndholdte.
-               </para>
-            </listitem>
-          </varlistentry>
-
-         <varlistentry>
-            <term>Flett til pilot:</term>
-            <listitem> 
-               <para>
-                  Kopier nye data fra datamaskinen til den håndtholdte og
-                  fjern all informasjon fra den håndholdte hvis den også
-                  er slettet på datamaskinen.
-               </para>
-            </listitem>
-          </varlistentry>
-       </variablelist>
-    </para>
-
-    <para>
-      Velg oppførselen du ønsker for hver komponent du velger å bruke.
-      Hvis du er usikker kan du bruke
-      <guilabel>Synkroniser</guilabel>.  Plasser så din håndholdte i
-      dokken og trykk på HotSync knappen.
-    </para>
-      <para> 
-         <tip> 
-	  <title>Forhindring av datatap</title> 
-	  <para>
-	    Det er alltid lurt å ta en sikkerhetskopi. For å gjøre dette
-	    lager du en kopi av katalogen <filename>evolution</filename>
-	    i din hjemmekatalog.
-          </para>
-	</tip>
-       </para>
-
-    </chapter>
diff --git a/help/no/evolution-faq.sgml b/help/no/evolution-faq.sgml
deleted file mode 100644
index 8e658ff308..0000000000
--- a/help/no/evolution-faq.sgml
+++ /dev/null
@@ -1,973 +0,0 @@
-<!--
-<!DOCTYPE appendix PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-<appendix id="evolution-faq">
-  <title>Frequently Asked Questions About Ximian Evolution</title>
-    	<para>
-	 Here are some frequently asked questions about the
-	 <application>Evolution</application> groupware suite from
-	 Ximian.  If you have a question that's not listed, you can
-	 contact us at evolve@ximian.com.
-	</para>
-
-  <sect1 id="faq-features">
-    <title>Features</title>
-
-    <qandaset>
-
-      <qandaentry>
-	<question>
-	  <para>
-	   How can I use Evolution with Microsoft Exchange or Lotus Notes?
-	  </para>
-	</question>
-	<answer>
-	  <para>
-             If your server uses standard open protocols like IMAP,
-             LDAP, POP, and SMTP, you can use Evolution with it.  You
-             can share addresses with vCards and calendar items with
-             iCal appointments.
-	  </para>
-        </answer>
-       </qandaentry>
-
-      <qandaentry>
-	<question>
-	  <para>
-	     Can I use Evolution with KDE?
-	  </para>
-	</question>
-	<answer>
-	  <para>
-             Evolution will work fine in KDE.  You will need to
-             install all of the GNOME libraries that it depends on.
-             Also, certain configuration options, such as default
-             fonts and the message editor keybinding behavior, must be
-             changed using the GNOME Control Center application (this
-             will also run from within KDE).
-	  </para>
-        </answer>
-       </qandaentry>
-
-      <qandaentry>
-	<question>
-	  <para>
-	    How can I remove or rename a folder?
-	  </para>
-	</question>
-	<answer>
-	  <para>
-            Right-click on the folder and select the
-            <guimenuitem>Delete</guimenuitem> or
-            <guimenuitem>Rename</guimenuitem> items.
-	  </para>
-	</answer> 
-      </qandaentry>
- 
-      <qandaentry>
-	<question>
-	  <para>
-	    Why doesn't drag and drop between folders seem to work?
-	  </para>
-	</question>
-	<answer>
-	  <para>
-	    The implementation isn't finished, although it's nearly done.
-  	  </para>
-
-	  <para>
-	    In the meantime, right-click on the folders or messages
-	    you want to move, and select the
-	    <guimenuitem>Move</guimenuitem> or
-	    <guimenuitem>Copy</guimenuitem> options.
-	  </para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
-      <question>
-	<para>
-	  Can I read mail from a mailbox file created by some other
-	  application (e.g. Mutt) without importing mail from it?
-	</para>
-	</question>
-	<answer>
-	  <para>
-	    No, but it's a planned feature.
-	  </para>
-	</answer> 
-      </qandaentry>
-
-      <qandaentry>
-	<question>
-	  <para>
-	    Can Evolution sync with my Palm OS (tm) device?
-	  </para>
-	</question>
-	<answer>
-	  <para>
-	    Yes.  However, it is not yet stable enough for general
-	    release and we do not yet ship Evolution with Palm
-	    synchronization enabled default. Until we do, you will
-	    need to compile this in yourself. Check the
-	    <filename>README</filename> file for additional
-	    information on the requirements.  Full compatibility and
-	    synchronization for calendar and addressbook applications
-	    on Palm devices will be implemented and shipped soon.
- 	  </para>
-	</answer> 
-      </qandaentry>
-      <qandaentry>
-	<question>
-	  <para>
-	    What is the difference between a virtual folder (vfolder)
-	    and a regular folder?
-	  </para>
-	</question>
-	<answer>
-	  <para>
-	    A virtual folder is like a saved search: it is a view of
-	    your mail. Regular folders actually contain the mail
-	    messages.  You can have one message be in multiple virtual
-	    folders, but only in one regular folder.  See the section
-	    in the Evolution manual about virtual folders for more
-	    information.
-	  </para>
-	</answer> 
-      </qandaentry>
-      <qandaentry>
-	<question>
-	  <para>
-	    Can Evolution spell-check messages while I compose them?
-	  </para>
-	</question>
-	<answer>
-	  <para>
-	    Yes. The Evolution composer is able to highlight
-	    mis-spelled word on the fly as you type them, and also
-	    give you suggestions for possible corrections.  In order
-	    for this to work you need the
-	    <filename>gnome-spell</filename> component, which is not
-	    shipped with Ximian GNOME yet.
- 	 </para>
-
-	  <para>
-	    If you are brave enough, you can check out module
-	    <filename>gnome-spell</filename> from the GNOME CVS and
-	    compile it yourself.  Check out its README file for a list
-	    of <filename>gnome-spell</filename>'s requirements for
-	    compilation.
-	  </para>
-
-	  <para>
-	    Note that you don't need to recompile Evolution after
-	    installing <filename>gnome-spell</filename>; it will be
-	    picked up automatically.
-	  </para>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
-	<question>
-	  <para>
-	    Why can't I see the images that are contained in some HTML
-	    mail messages.
-	  </para>
-	</question>
-	<answer>
-	  <para>
-  	    Evolution currently doesn't support this, but it's a
-	    planned feature.  It will be an option: many people like
-	    to turn off the images because they use up bandwidth and can
-            be used to spy on your email reading habits.
-	  </para>
-	</answer> 
-      </qandaentry>
-
-      <qandaentry>
-	<question>
-	  <para>
-	    Can I change the font that Evolution uses to compose and
-	    display mail messages?
-	  </para>
-	</question>
-	<answer>
-	  <para>
-	    You have to change the GtkHTML settings for that: in the
-	    GNOME Control Center, go to the "HTML Viewer"
-	    configuration page, which is under the "Document Handlers"
-	    category.
-	</para>
-	</answer> 
-      </qandaentry>
-      <qandaentry>
-	<question>
-	  <para>
-            How do I import my Outlook <filename>.pst</filename> files into Evolution?
-         </para>
-	</question>
-	<answer>
-	  <para>
-            You cannot import these files directly into Evolution
-            because the <filename>.pst</filename> format is a
-            proprietary format. However, Mozilla Mail on Windows can
-            convert them into the <type>mbox</type> format, which can
-            then be imported by Evolution.
-          </para>
-      
-	  <para>
-            To start importing your Outlook mail to Evolution, run
-            Mozilla Mail on Windows and select the
-            <menuchoice><guimenu>File</guimenu><guimenuitem>Import...</guimenuitem></menuchoice>
-            to begin. Then select that you wish to import Mail from
-            Outlook. Once Mozilla has imported all your mail, reboot
-            your computer into Linux.
-          </para>
-      
-          <para>
-            Mount your Windows partition in Linux and run Evolution to
-            begin importing your mail. Select
-            <menuchoice><guimenu>File</guimenu><guimenuitem>Import
-            File...</guimenuitem></menuchoice> to start importing. Set
-            the file type to MBox (mbox) and click on
-            <guibutton>Browse</guibutton> to select the mail you want
-            to import.
-          </para>
-      
-          <para>
-            If you are the only user on Windows, the mail files will
-            be stored in <filename>/mnt/c/windows/Application
-            Data/Mozilla/Profiles/default/XXXX/Mail/imported.mail/</filename>
-            where <filename>/mnt/c/</filename> is your windows
-            partition mount point and XXXX is some collection of
-            numbers and digits ending in <filename>.slt</filename>.
-          </para>
-	  
-	  <para>
-            If there is more than one user, the file will be in
-            <filename>/mnt/c/windows/Profiles/USERNAME/XXXX/Mail/imported.mail/</filename>
-            where USERNAME is your Windows username.
-         </para>
-
-	  <para>
-            For each mail folder in Outlook, Mozilla will convert the
-            folder into one mbox file. To import all your mail, import
-            all the files without a <filename>.msf</filename>
-            extension.
-           </para>
-	</answer> 
-      </qandaentry>
-
-      <qandaentry>
-        <question>
-          <para>
-            If Mozilla can import <filename>.pst</filename> files, why can't Evolution?
-          </para> 
-        </question>
-        <answer>
-          <para>
-            Mozilla on Windows accesses the <filename>.pst</filename>
-            files through the <filename>MAPI.DLL</filename>, which is
-            only available on Windows.  <filename>MAPI.DLL</filename>
-            is the only way to access <filename>.pst</filename> files
-            and Evolution cannot use this DLL in Linux.
-          </para>
-        </answer> 
-      </qandaentry>
-      <qandaentry>
-        <question>
-          <para>
-             Will there be an Evolution server? How about a text-based or web-based front end?
-           </para>
-        </question>
-        <answer>
-          <para>
-            Of course, we can't comment on unannounced future product
-            plans, but Evolution's architecture would permit the
-            existence of that kind of software. If there is enough
-            demand for such software we will consider moving in that
-            direction.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry>
-        <question>
-          <para>
-           Will Evolution make a good mocha?
-           </para>
-        </question>
-        <answer>
-          <para>
-             Only espresso is planned, but you can easily plug in a chocolate component.
-          </para>
-        </answer>
-      </qandaentry>
-
-    </qandaset>
-  </sect1>
-
-
-  <!-- Section: Getting and compiling -->
-
-  <sect1 id="faq-get-and-compile">
-    <title>
-      Getting and Compiling Evolution
-    </title>
-     <qandaset>
-      <qandaentry>
-        <question>
-          <para>
-            Where can I get the latest Evolution release?
-          </para>
-        </question>
-        <answer>
-          <para>
-            There are two ways to install the latest Evolution
-            release:
-            <itemizedlist>
-              <listitem>
-                <para>
-                  If you have Ximian GNOME installed, you can start
-                  Red Carpet, Ximian's software updating system, and
-                  subscribe to the Evolution channel.  This will let
-                  you install a binary for the latest release, and
-                  will also warn you when a new version has been made
-                  available.
-                </para>
-              </listitem>
-
-              <listitem>
-                <para>
-                  If you want to compile from source, you can
-                  download the latest official Evolution tarball
-                  from:
-                </para>
-
-                <para>
-                  <ulink url="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/evolution">
-                    ftp://ftp.gnome.org/pub/GNOME/unstable/sources/evolution</ulink>
-                </para>
-              </listitem>
-            </itemizedlist>
-          </para>  
-        </answer>      
-      </qandaentry>
-      <qandaentry>
-        <question>
-          <para>
-            Are binary snapshots available?
-          </para>
-        </question>
-        <answer>
-          <para>
-            Yes, if you have Ximian GNOME installed.  Just run Red
-            Carpet and subscribe to the Evolution Snapshot channel.
-          </para>
-
-          <para>
-            You can check the status of snapshots at
-            <ulink url="http://primates.ximian.com/~snapshot">http://primates.ximian.com/~snapshot</ulink>.
-          </para>
-        </answer>
-      </qandaentry>
-      <qandaentry>
-        <question>
-          <para>
-            Why isn't a new snapshot available today?
-          </para>
-        </question>
-        <answer>
-          <para>
-            Sometimes the build might fail because of problems with
-            the source on CVS.  In this case, just wait for next day's
-            snapshot.
-          </para>
-        </answer>
-      </qandaentry>
-      <qandaentry>
-        <question>
-          <para>
-            How do I get Evolution from CVS?
-          </para>
-        </question>
-        <answer>
-          <para>
-            If you already have
-            <ulink url="http://cvs.gnome.org">GNOME CVS</ulink> access,
-            simply check out the following modules: evolution,
-            gtkhtml, gal.
-          </para>
-          <para>
-            If you don't have a CVS account, you can use anoncvs
-            instead. Bear in mind that anoncvs is only synchronized once
-            a day, and code received from anoncvs may not be latest
-            version available.
-          </para>
-
-          <para>
-            Before using the anoncvs server, you have to log into it.
-            This only needs to be done once. Use this command:
-          </para>
-
-          <programlisting>
-            cvs -z3 -d :pserver:anonymous@anoncvs.gnome.org:/cvs/gnome login
-          </programlisting>
-
-          <para>
-            Then you can retrieve the modules needed to compile Evolution
-            using the following command:
-          </para>
-
-          <programlisting>
-            cvs -z3 -d :pserver:anonymous@anoncvs.gnome.org:/cvs/gnome co evolution gtkhtml gal
-          </programlisting>
-        </answer>
-      </qandaentry>
-
-      <qandaentry>
-        <question>
-          <para>
-            How should I compile Evolution avoiding conflicts with my
-            existing GNOME installation?
-          </para>
-        </question>
-        <answer>
-          <para>
-            The best way is to install Evolution into a separate prefix.
-            In order to specify a non-default installation prefix, you
-            can pass the <parameter>--prefix</parameter> option to
-            <filename>configure</filename> or
-            <filename>autogen.sh</filename>.  For example:
-          </para>
-
-          <programlisting>
-            cd /cvs/evolution
-            ./autogen.sh --prefix=/opt/gnome
-          </programlisting>
-
-          <para>
-            If you install Evolution and the Evolution libraries in a
-            non-standard prefix, make sure you set the appropriate
-            environment variables in the startup script for Evolution:
-          </para>
-
-          <programlisting>
-            export PATH=/opt/gnome:$PATH
-            export GNOME_PATH=/opt/gnome:/usr
-          </programlisting>
-
-          <para>
-            You may also need to add <filename>$prefix/lib</filename>
-            (e.g. <filename>/opt/gnome/lib</filename>) to your
-            <filename>/etc/ld.so.conf</filename>.  Of course, this will
-            not work for systems which do not use ld.so.conf, such as
-            HP-UX.
-          </para>
-        </answer>
-      </qandaentry>
-      <qandaentry>
-        <question>
-          <para>
-            I get the error message: <computeroutput>make: *** No rule
-              to make target
-              `all-no-@BUILD_INCLUDED_LIBINTL@'</computeroutput>
-          </para>
-        </question>
-        <answer>
-          <para>
-            You probably have <filename>gettext</filename> 0.10.36 or
-            later installed.  Try downgrading to 0.10.35;
-            unfortunately, 0.10.36 introduced some incompatibilities
-            with the current <filename>xml-i18n-tools</filename>.
-          </para>
-        </answer>
-      </qandaentry>
-    </qandaset>
-  </sect1>
-
-    <sect1 id="faq-trouble">
-      <title>Troubleshooting</title>
-    <qandaset>
-      <qandaentry>
-	<question>
-	  <para>
-	    I get <computeroutput>Cannot initialize the Evolution
-	    shell</computeroutput>.
-	   </para>
-	</question>
-	<answer>
-	  <para>
-	    There are a number of things that can cause this error.
-	    Check that:
-	  </para>
-
-	    <itemizedlist>
-	      <listitem>
-		<para>
-		  <filename>oafd</filename> is listed in your <envar>PATH</envar>
-		  environment variable.
-		</para>
-	      </listitem>
-
-	      <listitem>
-		<para>
-		  <filename>GNOME_Evolution_Shell.oaf</filename> and
-		  the other      
-		  <filename>GNOME_Evolution_*.oaf</filename> files are
-		  readable and installed in
-		  <filename>$prefix/share/oaf</filename>, where
-		  <filename>$prefix</filename> is one of the prefixes
-		  listed in <envar>GNOME_PATH</envar> or
-		  <envar>OAF_INFO_PATH</envar>.  (These variables are
-		  supposed to contain $PATH-like colon-separated lists of
-		  paths.  If the installation prefix for Evolution is
-		  different from that). Run `oaf-slay' once before running
-		  `evolution' again if you change $GNOME_PATH or
-		  $OAF_INFO_PATH.
-		</para>
-	      </listitem>
-
-	      <listitem>
-		<para>
-		  <filename>evolution</filename>,
-		  <filename>evolution-mail</filename> and the other
-		  <filename>evolution-*</filename> executables are in your
-		  $PATH.
-		</para>
-	      </listitem>
-	    </itemizedlist>
-	</answer>
-      </qandaentry>
-
-      <qandaentry>
-        <question>
-          <para>
-            I get <computeroutput>Cannot open composer window</computeroutput>.
-          </para>
-        </question>
-        <answer>
-          <para>
-            This actually means that Evolution cannot activate the HTML
-            editor component from GtkHTML.  The comments in the previous
-            answer still apply; also make sure that
-            <command>gnome-gtkhtml-editor</command> is in your
-            <envar>PATH</envar>.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry>
-        <question>
-          <para>
-            The address suggestion list steals focus from the "To:"
-            entry box when I'm typing. How can I make it keep focus?
-          </para>
-        </question>
-        <answer>
-          <para>
-           This is a bug in GTK version 1.2.10. To avoid it, downgrade
-           to GTK version 1.2.9, or install the Ximian version of GTK
-           1.2.10.
-          </para>
-        </answer>
-      </qandaentry>
-      
-      <qandaentry>
-        <question>
-          <para>
-            I updated Evolution and now my addressbook information is gone!
-            What should I do?
-          </para>
-        </question>
-        <answer>
-          <para>
-            Evolution uses the <filename>libdb</filename> library to
-            handle the addressbook database.  Two versions of
-            <filename>libdb</filename> can be used with Evolution: version
-            1.88 and version 2.
-          </para>
-
-          <para>
-            Unfortunately, an Evolution executable that is linked against
-            a certain version of <filename>libdb</filename> will only be
-            able to read addressbook files written by another Evolution
-            executable that is linked with the same version of the
-            library.  If your addressbook is not readable by Evolution
-            anymore, it probably means that you used to have Evolution
-            linked with a certain version of <filename>libdb</filename>,
-            but now it gets linked to a different version.
-          </para>
-
-          <para>
-            Because of the way <filename>libdb</filename> is designed, it
-            is not easy for Evolution to automatically do the conversion
-            between the two formats.  But, if your Evolution used to be
-            linked against version 1.85 and now is linked to version 2,
-            there is a very simple way to convert the database and recover
-            your data.
-          </para>
-
-          <itemizedlist>
-
-            <listitem>
-              <para>
-                First of all, check the format of the database using the
-                <command>file</command> command:
-              </para>
-
-              <programlisting>
-                file ~/evolution/local/Contacts/addressbook.db
-              </programlisting>
-
-              <para>
-                You want version 1.85 there.  If your version is 2, then
-                your current Evolution is probably linked against
-                version 1.85 and you cannot convert the database to the
-                old format. To do that, follow these instructions:
-              </para>
-            </listitem>
-            
-            <listitem>
-              <para>
-                Quit Evolution.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Make a copy of the addressbook database for backup
-                purposes, then move the original out of the way.
-              </para>
-
-              <programlisting>
-                cd ~/evolution/local/Contacts
-                cp addressbook.db addressbook.db.backup
-                mv addressbook.db addressbook.db.tmp
-               </programlisting>
-            </listitem>
-
-            <listitem>
-              <para>
-                Convert the contacts to the new format using
-                <command>db_dump185</command> and
-                <command>db_load</command>:
-              </para>
-
-              <programlisting>
-                db_dump185 addressbook.db.tmp | db_load ~/evolution/local/Contacts/addressbook.db
-              </programlisting>
-            </listitem>
-
-            <listitem>
-              <para>
-                Restart Evolution.
-              </para>
-            </listitem>
-
-          </itemizedlist>
-        </answer> 
-      </qandaentry>
-
-      <qandaentry>
-        <question>
-          <para>
-            Evolution reported an error when trying to retrieve from my
-            local spool in <filename>/var/spool/mail/username</filename>.  Why?
-          </para>
-        </question>
-        <answer>
-          <para>
-            Evolution doesn't have an external helper for moving mail,
-            so <filename>/var/spool/mail/</filename> must be writable
-            by you.  Try this:
-          </para>
-          
-          <programlisting>
-            chmod 1777 /var/spool/mail
-          </programlisting>
-
-          <para>
-            We're working on a solution to this problem now.
-          </para>
-        </answer>
-      </qandaentry>
-
-      <qandaentry>
-        <question>
-          <para>
-            Evolution crashes reporting that it couldn't allocate N
-            billion bytes; how do I fix this?
-          </para>
-        </question>
-        <answer>
-          <para>
-            This usually happens when a component tries talking a
-            certain version of a CORBA interface to another component
-            that supports a different version.  For example, this can
-            happen when you recompile and install a single component
-            without recompiling/installing the rest of Evolution.
-          </para>
-
-          <para>
-            If you run into this problem, make sure all the components
-            are compiled and installed at the same time.  This also
-            applies to GtkHTML upgrades; after upgrading and
-            installing a newer GtkHTML, always re-compile and
-            re-install Evolution against it.
-          </para>
-        </answer> 
-      </qandaentry>
-
-      <qandaentry>
-        <question>
-          <para>
-            What is <command>killev</command> and why do I need to use it?
-          </para>
-        </question>
-        <answer>
-          <para>
-            Evolution is actually made up of several components that run
-            as separate processes.  Evolution's shell is not very good
-            at cleaning up stale processes, so it is possible that
-            sometimes already-running components cause unexpected and/or
-            broken behavior.
-          </para>
-
-          <para>
-            It's always a good idea to run <command>killev</command>
-            after a crash in Evolution, especially if the Evolution
-            shell itself crashed.  (If a component crashes instead, you
-            should try to exit the shell cleanly first, so you give a
-            chance to the other components to clean things up properly.)
-          </para>
-        </answer> 
-      </qandaentry>
-
-      <qandaentry>
-        <question>
-          <para>
-            What is <command>oaf-slay</command> and why do I need to use it?
-          </para>
-        </question>
-        <answer>
-          <para>
-            <command>oaf-slay</command> is an utility which comes with
-            OAF, the Object Activation Framework that is used in the
-            GNOME Desktop to activate components.  It will kill the
-            object activation daemon (<command>oafd</command>) as well
-            as all the active components on the system.
-          </para>
-
-          <para>
-            Using <command>oaf-slay</command>
-            <command>oaf-slay</command> is quite drastic and can cause
-            problems with other programs that use oaf, especially with
-            <application>Nautilus</application>. To avoid problems, do
-            not run <command>oaf-slay</command> while you are in GNOME.
-          </para>
-        </answer>
-      </qandaentry>
-    </qandaset>
-  </sect1>
-
-  <sect1 id="faq-debugging">
-    <title>Questions about Bugs and Debugging</title>
-    <para>
-      Find a bug? Here's how to help us fix it!
-    </para>
-    
-    <qandaset>
-      <qandaentry>
-        <question>
-          <para>
-            Where should I report bugs for Evolution?
-          </para>
-        </question>
-        <answer>
-          <para>
-            You can use the GNOME Bug Report Tool
-            (<command>bug-buddy</command>), or report bugs to the
-            Ximian bug reporting system (Bugzilla), located at <ulink
-            url="http://bugzilla.ximian.com">http://bugzilla.ximian.com</ulink>.
-          </para>
-          
-          <para>
-            Please use the query function to check if a bug has been
-            submitted already, so that we avoid duplicate reports.
-          </para>
-        </answer> 
-      </qandaentry>
-      
-
-      <qandaentry>
-        <question>
-          <para>
-             What is a stack trace (backtrace) and how do I get one?
-           </para>
-        </question>
-        <answer>
-          <para>
-              A stack trace is a list of the chain of function calls
-              that lead to some point in the program. Typically, you
-              want to get a stack trace when Evolution crashes or
-              hangs and you want to try to figure out where in the
-              code that happened and why. For this reason, stack
-              traces are extremely useful for the Evolution
-              developers, so it's important that you learn how to get
-              them, and include them in crash reports. The
-              <application>bug-buddy</application> tool can get and
-              submit a stack trace for you.  If you want to do it by
-              yourself, here's how:
-          </para>
-          <para>
-             First of all, in order to get a stack trace, your
-             executable (and possibly the libraries) must be compiled
-             with debugging symbols. Debugging symbols are created by
-             default if you compile from CVS, and are included in the
-             snapshot builds. If you decide to compile by yourself
-             with some custom CFLAGS value, make sure -g is included
-             in them.
-          </para>
-          <para>
-            Finally, you must put the component that crashes through
-            <application>gdb</application>, the GNU debugging tool.
-            To do so, make sure all the components are dead (exit
-            Evolution and run <command>killev</command>), then run the
-            following command:
-               <programlisting>
-                   <command>gdb name-of-component</command>
-                </programlisting>
-           
-           Where "name-of-component" is the name of the component that
-           crashed.
-           </para>
-           <para>
-             Then, at the gdb prompt, type r (for "run") and wait a
-             few seconds to make sure the component has registered
-             with the name service. Then start
-             <application>Evolution</application> normally from a
-             different terminal.
-           </para>
-           <para>
-             When you have started
-             <application>Evolution</application>, reproduce the
-             crash, and go back to the terminal where you ran gdb. If
-             the component crashed, you should have a prompt there;
-             otherwise, just hit Control+C. At the prompt, type
-             <command>info threads</command>.  This will give you a
-             screen that looks like this:
-           </para>
-           <para>
-              <programlisting>
-(gdb) info threads
-  8 Thread 6151 (LWP 14908)  0x409778fe in sigsuspend () from /lib/libc.so.6
-  7 Thread 5126 (LWP 14907)  0x409778fe in sigsuspend () from /lib/libc.so.6
-  6 Thread 4101 (LWP 1007)  0x409778fe in sigsuspend () from /lib/libc.so.6
-  5 Thread 3076 (LWP 1006)  0x409778fe in sigsuspend () from /lib/libc.so.6
-  4 Thread 2051 (LWP 1005)  0x409778fe in sigsuspend () from /lib/libc.so.6
-  3 Thread 1026 (LWP 1004)  0x409778fe in sigsuspend () from /lib/libc.so.6
-  2 Thread 2049 (LWP 1003)  0x40a10d90 in poll () from /lib/libc.so.6
-  1 Thread 1024 (LWP 995)  0x40a10d90 in poll () from /lib/libc.so.6
-            </programlisting>
- 
-             For the most part, only
-             <application>evolution-mail</application> will have more
-             than one thread.
-         </para>
-         <para>
-           Now, for each of the threads listed, type the following commands:
-<programlisting>
-thread N
-bt
-</programlisting>
-           Where 'N' is the number of the thread (in this example, 1
-           through 8).
-          </para>
-          <para>
-            Cut and paste all the output gdb gives you into a text
-            file.  You can quit gdb by typing
-            <userinput>quit</userinput>
-          </para>
-          <para>
-            If you prefer, you can start gdb while a process is
-            running. You'll want to do this right after a crash dialog
-            appears, but before hitting "OK" or "Submit bug report".
-            Start <application>gdb</application> as above, but instead
-            of using <userinput>r</userinput>, type <userinput>attach
-            PID</userinput> where PID is the process ID of the
-            component you want to debug.
-          </para>
-          <para>
-             If that sounds too complicated, you can always use
-             <command>bug-buddy</command> to get and submit the stack
-             trace.
-           </para>
-        </answer>
-      </qandaentry>
-      <qandaentry>
-	<question>
-	  <para>
-             A component of evolution crashed, but since the rest of
-             evolution stayed up, I couldn't use bug-buddy to get a
-             stack trace. How can I use gdb to get a stack trace of
-             the component?
-           </para>
-	</question>
-	<answer>
-	  <para>
-             To trace a failing component (in this example, evolution-mail):
-             <orderedlist numeration="arabic">
-	      <listitem>
-		<para>
-                  Open two terminals.
-                </para>
-	      </listitem>
-	      <listitem>
-		<para>
-                   In one, type <command>gdb evolution-mail</command>
-                   .  Replace "evolution-mail" with the name of the
-                   component that is crashing: evolution-addressbook,
-                   evolution-calendar, etc.)
-                 </para>
-	      </listitem>
-	      <listitem>
-		<para>
-                  Once gdb starts, type <userinput>r</userinput> and
-                  hit enter. Give it a few seconds, to make sure it
-                  starts up completely.
-                </para>
-	      </listitem>
-	      <listitem>
-		<para>
-                   In the second terminal, type
-                   <command>evolution</command>. Do whatever you did
-                   to cause the crash in the component you used in
-                   step two.
-                </para>
-	      </listitem>  
-	      <listitem>
-		<para>
-                   When the crash occurs, type 'bt' in the first
-                   terminal. 
-                </para>
-	      </listitem>
-	      
-	      <listitem>
-		<para>
-                   Cut and paste the output into your bug report.
-                </para>
-	      </listitem>
-	    </orderedlist>
-           </para>
-	</answer>
-      </qandaentry>
-    </qandaset>
-  </sect1>
-  </appendix>
-
-<!-- Local Variables: --> <!-- indent-tabs-mode:nil --> <!-- End: -->
-
-
-
-
diff --git a/help/no/evolution-no.omf b/help/no/evolution-no.omf
deleted file mode 100644
index 3f8c797af6..0000000000
--- a/help/no/evolution-no.omf
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<omf>
-  <resource>
-   <creator>
-     Ximian, Inc.
-   </creator>
-    <title>
-      Evolution brukerhåndbok
-    </title>
-    <date>2002</date>
-    <subject category="GNOME|Applikasjoner"/>
-    <format mime="text/sgml"/>
-    <identifier url="index.html"/>
-    <language code="no"/>
-  </resource>
-</omf>
diff --git a/help/no/evolution.sgml b/help/no/evolution.sgml
deleted file mode 100644
index 348c30c3a8..0000000000
--- a/help/no/evolution.sgml
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.1//EN"[
-
-<!ENTITY PREFACE SYSTEM "preface.sgml">
-<!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.sgml">
-<!ENTITY USAGE-EXEC-SUMMARY SYSTEM "usage-exec-summary.sgml">
-<!ENTITY USAGE-MAIL SYSTEM "usage-mail.sgml">
-<!ENTITY USAGE-MAIL-ORG SYSTEM "usage-mail-org.sgml">
-<!ENTITY USAGE-CONTACT SYSTEM "usage-contact.sgml">
-<!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.sgml">
-<!ENTITY USAGE-SYNC SYSTEM "usage-sync.sgml">
-<!ENTITY USAGE-PRINT SYSTEM "usage-print.sgml">
-<!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
-<!ENTITY CONFIG-SYNC SYSTEM "config-sync.sgml">
-<!ENTITY MENUREF SYSTEM "menuref.sgml">
-<!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml">
-<!ENTITY APX-COMMON-TASKS SYSTEM "apx-common-tasks.sgml">
-<!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml">
-<!ENTITY APX-AUTHORS SYSTEM "apx-authors.sgml">
-
-]>
-
-
-<!-- Almost every chapter is an entity.  Files, Chapter id's, and
-entity names correspond.  APX is for appendix. Note that there is no
-entity for apx-notes.sgml, which is still included in the file
-set. Reinstate the entity if and when the Notes feature is
-implemented. -->
-
-<book id="index">
-  <bookinfo>
-    <title>En brukers håndbok for Evolution</title>
-    <authorgroup>
-      <author><firstname>Aaron</firstname><surname>Weber</surname></author>
-      <author><firstname>Kevin</firstname><surname>Breit</surname></author>
-      <author><firstname>Ettore</firstname><surname>Perazzoli</surname></author>
-      <author><firstname>Duncan</firstname><surname>Mak</surname></author>
-    </authorgroup>
-    <copyright>
-      <year>2001</year>
-      <holder>Ximian, Inc.</holder>
-    </copyright>
-    
-  <legalnotice id="legalnotice"> 
-    
-   <para>
-     Det gis herved rett til å kopiere, distribuere og/eller endre
-     dette dokumentet under betingelsene gitt i <ulink type="help"
-     url="gnome-help:fdl"><citetitle>GNU Free Documentation
-     License</citetitle></ulink>, versjon 1.1 eller enhver senere versjon
-     publisert av Free Software Foundation uten "Invariant
-     Sections", uten forsidetekst, og uten baksidetekst. Du kan få en kopi av
-     <citetitle>GNU Free Documentation License</citetitle> fra Free Software
-     foundation ved å gå til <ulink type="http" url="http://www.fsf.org">deres
-     nettside</ulink> eller ved å skrive til: Free Software Foundation,
-     Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA..
-   </para>
-
-   <para>
-     Mange av navnene som brukes av firmaer for å gjøre sine
-     produkter og tjenester unik er tatt som merkenavn. Der hvor disse
-     navnene brukes i GNOME's dokumentasjon, og disse merkenavnene gjøres
-     kjent for medlemmer av GNOME Documentation Project, har disse navnene
-     blitt skrevet med store bokstaver eller de begynner med stor bokstav.
-   </para>
-
-  </legalnotice>
-
-   <releaseinfo>
-      Dette er versjon 1.0 av Evolution's brukerhåndbok.
-   </releaseinfo>
-
-  </bookinfo>
-
-  &PREFACE;
-  
-  <part id="usage">
-    <title>Kom i gang med Ximian Evolution</title>
-     <partintro>
-      <para>
-        Første del av <application>Evolution</application> håndboken
-        beskriver hvordan du bruker <application>Evolution</application>
-	for e-post, kontakthåndtering, og styring av avtaler og oppgaver.
-        Du vil etterhvert finne ut at det er flere måter
-        å gjøre ting på, og du kan velge den metoden du liker best
-        selv.
-      </para>
-    </partintro>
-
-    &USAGE-MAINWINDOW;
-    &USAGE-EXEC-SUMMARY;
-    &USAGE-MAIL;
-    &USAGE-MAIL-ORG;
-    &USAGE-CONTACT;
-    &USAGE-CALENDAR;
-<!--   &USAGE-NOTES; -->
-    &USAGE-SYNC; 
-    &USAGE-PRINT;
-  </part>
-
-  <part id="config">
-  <title>Konfigurasjon og håndtering av Ximian Evolution</title>
-    <partintro>
-      <para>
-        <application>Ximian Evolution</application> er meget konfigurerbart.
-        Når utviklere sier dette mener de vanligvis at de ikke testet
-        det grundig og har overlatt det til andre programmerere å
-        "konfigurere" seg til et fungerende system. I tilfellet med
-        <application>Ximian Evolution</application>, betyr "konfigurerbart", 
-	at, mens du kan forvente at programmet fungerer helt greit med
-        standardinstillingene, er det også lett å endre oppførselen på
-        en rekke forskjellige måter, slik at det møter dine behov fullt ut.
-        Denne delen av boken vil beskrive denne prosessen, fra et lite
-        glimt av assistenten for oppsett til en omvisning i dialoger for
-        brukervalg som går mer i dybden.
-      </para>
-    </partintro>
-
-    &CONFIG-PREFS;
-    &CONFIG-SYNC;
-  </part>
-
-<!-- &FAQ; Just link to the webpage -->
-  &MENUREF;
-  &APX-GLOSS;
-  &APX-BUGS;
-  &APX-AUTHORS; 
-
-</book>
diff --git a/help/no/figures/calendar.png b/help/no/figures/calendar.png
deleted file mode 100644
index 1266f7b21b..0000000000
--- a/help/no/figures/calendar.png
+++ /dev/null
diff --git a/help/no/figures/config-cal.png b/help/no/figures/config-cal.png
deleted file mode 100644
index 5be44dc68d..0000000000
--- a/help/no/figures/config-cal.png
+++ /dev/null
diff --git a/help/no/figures/config-mail.png b/help/no/figures/config-mail.png
deleted file mode 100644
index 5fb06c705c..0000000000
--- a/help/no/figures/config-mail.png
+++ /dev/null
diff --git a/help/no/figures/contact-editor.png b/help/no/figures/contact-editor.png
deleted file mode 100644
index 988ad2f918..0000000000
--- a/help/no/figures/contact-editor.png
+++ /dev/null
diff --git a/help/no/figures/contact.png b/help/no/figures/contact.png
deleted file mode 100644
index 0748b30d69..0000000000
--- a/help/no/figures/contact.png
+++ /dev/null
diff --git a/help/no/figures/filter-assist-fig.png b/help/no/figures/filter-assist-fig.png
deleted file mode 100644
index 3240196307..0000000000
--- a/help/no/figures/filter-assist-fig.png
+++ /dev/null
diff --git a/help/no/figures/filter-new-fig.png b/help/no/figures/filter-new-fig.png
deleted file mode 100644
index 51fc680df9..0000000000
--- a/help/no/figures/filter-new-fig.png
+++ /dev/null
diff --git a/help/no/figures/full-1.png b/help/no/figures/full-1.png
deleted file mode 100644
index 84afc9d3e7..0000000000
--- a/help/no/figures/full-1.png
+++ /dev/null
diff --git a/help/no/figures/full-2.png b/help/no/figures/full-2.png
deleted file mode 100644
index 929e356db5..0000000000
--- a/help/no/figures/full-2.png
+++ /dev/null
diff --git a/help/no/figures/full-3.png b/help/no/figures/full-3.png
deleted file mode 100644
index 175fd1d970..0000000000
--- a/help/no/figures/full-3.png
+++ /dev/null
diff --git a/help/no/figures/full-4.png b/help/no/figures/full-4.png
deleted file mode 100644
index 45d66bb193..0000000000
--- a/help/no/figures/full-4.png
+++ /dev/null
diff --git a/help/no/figures/full-5.png b/help/no/figures/full-5.png
deleted file mode 100644
index 5fcfd20e45..0000000000
--- a/help/no/figures/full-5.png
+++ /dev/null
diff --git a/help/no/figures/full-6.png b/help/no/figures/full-6.png
deleted file mode 100644
index 484eca4903..0000000000
--- a/help/no/figures/full-6.png
+++ /dev/null
diff --git a/help/no/figures/full-7.png b/help/no/figures/full-7.png
deleted file mode 100644
index 8a19eaab42..0000000000
--- a/help/no/figures/full-7.png
+++ /dev/null
diff --git a/help/no/figures/mail-composer.png b/help/no/figures/mail-composer.png
deleted file mode 100644
index d85f632b64..0000000000
--- a/help/no/figures/mail-composer.png
+++ /dev/null
diff --git a/help/no/figures/mail-druid-pic.png b/help/no/figures/mail-druid-pic.png
deleted file mode 100644
index 18e29aa49d..0000000000
--- a/help/no/figures/mail-druid-pic.png
+++ /dev/null
diff --git a/help/no/figures/mail-inbox.png b/help/no/figures/mail-inbox.png
deleted file mode 100644
index 7659cb003a..0000000000
--- a/help/no/figures/mail-inbox.png
+++ /dev/null
diff --git a/help/no/figures/mainwindow-pic.png b/help/no/figures/mainwindow-pic.png
deleted file mode 100644
index 18b68c96a5..0000000000
--- a/help/no/figures/mainwindow-pic.png
+++ /dev/null
diff --git a/help/no/figures/newmsg.png b/help/no/figures/newmsg.png
deleted file mode 100644
index 9f2c15d025..0000000000
--- a/help/no/figures/newmsg.png
+++ /dev/null
diff --git a/help/no/figures/print-dest.png b/help/no/figures/print-dest.png
deleted file mode 100644
index fb1faf7d70..0000000000
--- a/help/no/figures/print-dest.png
+++ /dev/null
diff --git a/help/no/figures/print-preview.png b/help/no/figures/print-preview.png
deleted file mode 100644
index 51ab5e795e..0000000000
--- a/help/no/figures/print-preview.png
+++ /dev/null
diff --git a/help/no/figures/replymsg.png b/help/no/figures/replymsg.png
deleted file mode 100644
index 0952ba3805..0000000000
--- a/help/no/figures/replymsg.png
+++ /dev/null
diff --git a/help/no/figures/vfolder-createrule-fig.png b/help/no/figures/vfolder-createrule-fig.png
deleted file mode 100644
index cc0a7abf66..0000000000
--- a/help/no/figures/vfolder-createrule-fig.png
+++ /dev/null
diff --git a/help/no/menuref.sgml b/help/no/menuref.sgml
deleted file mode 100644
index 340a408847..0000000000
--- a/help/no/menuref.sgml
+++ /dev/null
@@ -1,421 +0,0 @@
-<!--
-<!DOCTYPE Appendix PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<appendix id="menuref">
-  <title>Quick Reference</title>
-  <para>
-      You might want to copy this section and tape it to the wall
-      next to your computer: it's a very short summary of most of
-      the things you'll want to do with
-      <application>Ximian Evolution</application>.
-   </para>
-
-
-<note id="shortcuts">
-<title>Custom Keyboard Shortcuts</title>
-<para>
-  If you have set custom keyboard shortcuts for your desktop, (you can
-   do this the control center: select
-   <menuchoice><guimenu>System</guimenu><guimenuitem>Settings</guimenuitem></menuchoice>
-   from your menu panel), they may interfere with Evolution keyboard
-   shortcuts.
-</para>
-<para>
-   For example, if you have chosen Emacs-style key bindings for your
-   desktop-wide text editor, the shortcut
-   <keycombo action="simul">
-    <keycap>Ctrl</keycap>
-    <keycap>W</keycap>
-  </keycombo>
-  will act as "Cut region" rather than as "Close Window" in the
-  message composer.
-</para>
-</note>
-
-
-
-
-  <sect1 id="quickref-open">
-      <title>Opening or Creating Anything</title>
-      <para>
-          <variablelist>
-
-
-	  <varlistentry>
-	    <term>New Item:</term>
-	    <listitem>
-	      <para>
-                Press <keycombo action="simul"> <keycap>Ctrl</keycap>
-		  <keycap>N</keycap> </keycombo> to open a new item
-		  for whatever part of <application>Ximian
-		  Evolution</application> you're working on. In mail,
-		  that means you'll create a new message. If you're
-		  looking at your addressbook, <keycombo
-		  action="simul"> <keycap>Ctrl</keycap>
-		  <keycap>N</keycap> </keycombo> creates a new contact
-		  card, and in the calendar, a new appointment.
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term>Create a new folder:</term>
-	    <listitem>
-	      <para>
-                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu>
-                <guimenuitem>Folder</guimenuitem></menuchoice> or
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>E</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Shortcut in the Evolution Bar:</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Evolution Bar Shortcut</guimenuitem> </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>S</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new email message:</term>
-	    <listitem>
-	      <para>
-                Use
-                <menuchoice><guimenu>File</guimenu><guisubmenu>New</guisubmenu><guimenuitem>Mail
-                Message</guimenuitem>  </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift </keycap>
-		  <keycap>M</keycap>
-                </keycombo>
-              </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Appointment:</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Appointment</guimenuitem> </menuchoice>  or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>A</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-
-	  <varlistentry>
-	    <term>Enter a new Contact:</term>
-	    <listitem>
-	      <para>       
-                  Double-click in any blank space in the contact
-                  manager to create a new address card.  You can also
-                  use 
-                 <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Contact</guimenuitem> </menuchoice>  or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>C</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Task:</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Task</guimenuitem>  </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>T</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-    </sect1> 
-    <sect1 id="quickref-mail">
-      <title>Mail Tasks</title>
-      <para>
-        Here are the most frequent email tasks, and shortcuts for
-        navigating your mailbox with the keyboard instead of the
-        mouse:
-         <variablelist>
-
-  
-        <varlistentry>
-	    <term>Send and Receive Mail:</term>
-	    <listitem>
-	      <para>
-                Press <keycap>F9</keycap>, click the
-                <guibutton>Send/Receive</guibutton> button in the
-                toolbar, or choose
-                <menuchoice><guimenu>Actions</guimenu> 
-                 <guimenuitem>Send/Receive</guimenuitem></menuchoice>.
-                </para>
-	    </listitem>
-	  </varlistentry>
-        <varlistentry>
-	    <term>Navigating the Message List with the Keyboard:</term>
-	    <listitem>
-	      <para>
-                Press <keycap>N</keycap> to jump to the next unread
-                message. <keycap>P</keycap> goes to the previous
-                unread message.  Use the arrow keys to move up
-                and down along the list of all messages.
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Move the display up and down in the preview pane:</term>
-	    <listitem>
-	      <para>
-                Press the space bar to go a page down.  Press
-                <keycap>Backspace</keycap> to go a page up.
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Reply to a Message:</term>
-	    <listitem>
-	      <para>
-                To reply to the sender of the message only:
-                click <guibutton>Reply</guibutton> in the
-                toolbar, or press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>R</keycap>
-                </keycombo>
-                </para>
-	      <para>
-                To reply to the sender and all the other visible
-                recipients of the message, click <guibutton>Reply to
-                All</guibutton> or select the message and press
-                <keycombo action="simul">
-		  <keycap>Shift</keycap>
-		  <keycap>Ctrl</keycap>
-		  <keycap>R</keycap>
-                </keycombo>
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  
-          <varlistentry>
-	    <term>Forward a Message:</term>
-	    <listitem>
-	      <para>
-                Select the message or messages you want to forward,
-                and click <guibutton>Forward</guibutton> in the
-                toolbar, or press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>F</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-	    <term>Open a Message in a New Window:</term>
-	    <listitem>
-	      <para>
-                Double-click the message you want to view, or select
-                it and press
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>O</keycap>
-                </keycombo>
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  
-          <varlistentry>
-	    <term>Create Filters and Virtual Folders:</term>
-	    <listitem>
-	      <para>
-                Right-click on a message and select
-                <guimenuitem>Create Rule From
-                Message</guimenuitem>. You can also create filters and
-                virtual folders in the <guimenu>Tools</guimenu> menu.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-
-          <varlistentry>
-	    <term>Add Sender to Address Book:</term>
-	    <listitem>
-	      <para>
-                Right-click on a message and select <guimenuitem>Add
-                Sender to Address Book</guimenuitem>.  You can also
-                right-click on any email address to add it to your
-                address book.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	
-
-
-      </para>
-    </sect1>
-    <sect1 id="quickref-cal">
-      <title>Calendar</title>
-      <para>
-        <variablelist>
-
-	  <varlistentry>
-	    <term>Create a new Appointment:</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Appointment</guimenuitem> </menuchoice>  or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>A</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Create a new Task:</term>
-	    <listitem>
-	      <para>       
-                  <menuchoice><guimenu>File</guimenu>
-		  <guisubmenu>New</guisubmenu>
-		  <guimenuitem>Task</guimenuitem>  </menuchoice> or 
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>T</keycap>
-                </keycombo>
-                </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term></term>
-	    <listitem>
-	      <para>
-		<tip id="new-appt">
-		  <title>New Appointments Fast</title>
-		  <para>
-		    Click on any blank spot in the calendar and start
-		    typing to create a new appointment entry.
-		  </para>
-		</tip>
-	      </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-
-        </para>
-  </sect1>
-    <sect1 id="quickref-contact">
-        <title>Addressbook</title>
-        <para>
-	Here are shortcuts for the most frequent addressbook actions:
-        <variablelist>
-	  <varlistentry>
-	    <term>Edit a Contact:</term>
-	    <listitem>
-	      <para>
-		You can edit a contact two ways:
-		<itemizedlist>
-		  <listitem>
-		    <para>
-		      Click once on the person's address card and you can
-		      edit the person's properties all in the same window.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Double-click on the contact's card and alter their details.
-		    </para>
-		  </listitem>
-		</itemizedlist>
-               </para>
-	    </listitem>
-	    </varlistentry>
-	  </variablelist>
-	
-	<variablelist>
-	  <varlistentry>
-	    <term>Deleting a Contact:</term>
-	    <listitem>
-	      <para>
-		Right click on a contact and click <guilabel>Delete</guilabel>
-		or select a contact and press the <guibutton>Delete</guibutton>
-		on the <guilabel>toolbar</guilabel>.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	
-	
-        <variablelist>
-	  <varlistentry>
-	    <term>Email a Contact:</term>
-	    <listitem>
-	      <para>
-		Right click on a contact and select 
-		<guilabel>Send message to contact</guilabel>.
-               </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	
-        <variablelist>
-	  <varlistentry>
-	    <term>Creating a New Contact:</term>
-	    <listitem>
-	      <para>
-                  Double-click in any blank space in the contact
-                  manager to create a new address card.  You can also
-                  use <menuchoice><guimenu>File</guimenu>
-                  <guisubmenu>New</guisubmenu>
-                  <guimenuitem>Contact</guimenuitem> </menuchoice> or
-                <keycombo action="simul">
-		  <keycap>Ctrl</keycap>
-		  <keycap>Shift</keycap>
-		  <keycap>C</keycap>
-                </keycombo>
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-      </para>
-  </sect1>
-</appendix>
\ No newline at end of file
diff --git a/help/no/preface.sgml b/help/no/preface.sgml
deleted file mode 100644
index 9637beaf4c..0000000000
--- a/help/no/preface.sgml
+++ /dev/null
@@ -1,83 +0,0 @@
-<!--
-<!DOCTYPE preface PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-  <preface id="introduction">
-    <title>About this Book</title> 
-      <sect1 id="organization">
-        <title>Organization</title>
-      <para>
-        This book is divided into two parts, with several
-        appendices. The first part is a <link linkend="usage">guided
-        tour</link>, which will explain how to use
-        <application>Evolution</application>.  If you are new to
-        <application>Evolution</application> or to groupware in
-        general, this section is for you. The second section, covering
-        <link linkend="config">configuration</link>, is targeted at
-        more advanced users, but anyone who wants to change the way
-        <application>Evolution</application> looks or acts can benefit
-        from reading it.  
-      </para>
-      </sect1>
-
-      <sect1 id="typography">
-        <title>Typographical conventions</title>
-	<para>
-          In this book, we'll mark some words with special typography:
-          <simplelist>
-	    <member><application>Applications</application></member>
-	    <member><command>Commands</command> you type at the command line</member>
-	    <member><guilabel>Labels</guilabel> for buttons and other portions of the graphical interface</member>
-
-            <member> Menu selections look like this:
-                       <menuchoice>
-                          <guimenu>Menu</guimenu>
-                          <guisubmenu>Submenu</guisubmenu> 
-                          <guimenuitem>Menu Item</guimenuitem>
-                     </menuchoice>
-            </member>
-	    <member><guibutton>Buttons</guibutton> you can
-            click</member> <member><userinput>Anything you type
-            in</userinput></member> <member><computeroutput>Text
-            output from a computer</computeroutput></member>
-	  <member><glossterm linkend="apx-gloss">Words</glossterm>
-            that are defined in the <xref linkend="apx-gloss">.</member>
-	  </simplelist>
-</para>
-<para>
-We'll provide assorted bits of additional information in tips set off from the rest of the book, as well. 
-
-	  <tip id="example-tip">
-	      <title>Tip</title>
-	      <para>
-		Tips and bits of extra information will look like
-		this.
-	      </para>
-	    </tip>
-</para>
-
-<para>
-Examples are also set off from the rest of the text.  They look like this:
-
-	  <example>
-	    <title>Example Example</title>
-	    <para>
-	      This is what an example looks like.  We'll provide
-	      examples for some of the more complicated tasks you
-	      might be performing.
-	    </para>
-	  </example>
-</para>
-<para>
-Lastly, we'll have warnings, in cases where you should be careful:
-
-	    <warning id="example-warning">
-	      <title>Example Warning</title>
-	      <para>
-		This is what a warning looks like. If there's a chance
-		you'll run into trouble, we'll warn you beforehand.
-	      </para>
-	  </warning>
-        </para>
-    </sect1>
-</preface>
-
diff --git a/help/no/topic.dat b/help/no/topic.dat
deleted file mode 100644
index 6e9afad2ef..0000000000
--- a/help/no/topic.dat
+++ /dev/null
@@ -1,10 +0,0 @@
-index.html Innholdsfortegnelse
-introduction.html Hva er Evolution?
-usage-mainwindow.html Kom i gang
-usage-summary.html Evolution sammendrag
-usage-mail.html Å hente og sende e-post
-usage-contact.html Bruk av kontakter
-usage-calendar.html Håndtering av avtaler
-config-prefs.html Konfigurasjon av Evolution
-menuref.html Hurtigreferanse
-apx-gloss.html Ordliste
diff --git a/help/no/usage-calendar.sgml b/help/no/usage-calendar.sgml
deleted file mode 100644
index 4a1745e55a..0000000000
--- a/help/no/usage-calendar.sgml
+++ /dev/null
@@ -1,561 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-
-<chapter id="usage-calendar">
-  <title>Managing your Schedule</title>
-
-     <para>
-      This chapter will show you how to use the Ximian Evolution
-      Calendar to manage your schedule alone or in conjunction with
-      peers.
-     </para>
-
-    <sect1 id ="usage-calendar-view"> 
-    <title>Ways of Looking at your Calendar</title>
-    <para>
-       The toolbar offers you four different views of your calendar:
-       <itemizedlist>
-	<listitem>
-	  <para>
-	    Day
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Work Week
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Week
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Month
-	  </para>
-	</listitem>
-      </itemizedlist>
-
-      Press the calendar-shaped buttons on the right side of the toolbar to
-      switch between views. 
-
-      You can also select a range of
-      days&mdash; three days, ten days, or a fortnight if you want
-      &mdash; in the small calendar at the upper right.  To do this, simply click and drag on the days that you wish to view in your calendar.
-
-    </para>
-    <para>
-       The <guibutton>Prev</guibutton> and <guibutton>Next</guibutton>
-       buttons will move you forward and back in your calendar pages.
-       If you're looking at only one day, you'll see tomorrow's page,
-       or yesterday's.  If you're looking at your calendar by week or
-       month, you'll move around by just that much.
-       To come back to today's listing, click the
-        <guibutton>Today</guibutton> button in the toolbar.
-    </para>
-    <para>
-       To visit a specific date's calendar entries, click
-       <guibutton>Go To</guibutton> and select the date in the dialog
-       box that appears.
-    </para>
-
-  </sect1>
-  <sect1 id="usage-calendar-apts">
-    <title>Scheduling With the Evolution Calendar</title>
-    <para>
-      Of course, you'll want to use the calendar to do more than find
-      out what day it is. This section will tell you how to schedule
-      appointments, set alarms, and determine appointment recurrence.
-    </para>
-
-    <sect2 id="usage-calendar-apts-basic">
-      <title>Creating appointments</title>
-      <para>
-	To create a new appointment, select
-        <menuchoice>
-	  <guimenu>File</guimenu>
-	  <guisubmenu>New</guisubmenu> 
-	  <guimenuitem>Appointment</guimenuitem>
-	</menuchoice>
-	or click the <guibutton>New Appointment</guibutton> button on the left end
-	of the toolbar. The <interface>New Appointment</interface>
-	dialog will pop up with the menu bar, tool bar, and
-	window full of choices for you.
-      </para>
-      <tip id="new-appointment-shortcut">
-        <title>Shortcut</title>
-        <para>
-           If you don't need to enter more information than the date
-           and time of the appointment, you just click in any blank
-           space in the calendar and start typing. You can enter other
-           information later with the appointment editor.
-        </para>
-      </tip>
-
-      <para>
-        Your appointment must have a starting and ending date &mdash; by
-        default, today &mdash; but you can choose whether to give it
-        starting and ending times or to mark it as an <guilabel>All
-        day event</guilabel>. An <guilabel>All day event</guilabel>
-        appears at the top of a day's appointment list, in the grey header under the date, rather than inside
-        it.  That makes it easy to have appointments that overlap and fit
-        inside each other.  For example, a conference might be an all
-        day appointment, and the meetings at the conference would be timed
-        appointments.  Of course, appointments with specific starting and ending
-        times can also overlap.  When they do they're displayed as
-        multiple columns in the day view of the calendar.
-      </para>
-      <para>
-	<application>Evolution</application> supports the use of timezones.  If you share calendar files with friends or co-workers, it is quite possible you will need to configure your timezone.  To configure your timezone:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Click 
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Calendar Settings</guimenuitem>
-	      </menuchoice>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Globe</guibutton> button in the <guilabel>Time</guilabel> section, located in the <guilabel>General</guilabel> tab.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Each red dot represents a major city.  Click a dot and click <guibutton>OK</guibutton> to select your time zone.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	You can also configure timezone information specific to Start and End time in each appointment.  To do that, simply create a new appointment and click on a globe to customize the timezone that the time exists in.
-      </para>
-      <note>
-       <title>Multiple Simultanious Appointments</title>
-         <para>
-           If you create calendar appointments that overlap,
-           <application>Evolution</application> will display them side
-           by side in your calendar.  However,
-           <application>Evolution</application> cannot help you do
-           multiple things at once.
-         </para>
-      </note>
-      <para>
-         You can have as many
-         <guilabel>Alarms</guilabel>, any time prior to the appointment
-         you've scheduled.  You can have one alarm of each of the following types:
-          <variablelist>
-           <varlistentry>
-	    <term><guilabel>Display:</guilabel></term>
-	    <listitem>
-	      <para>
-	        A window will pop up on your screen to remind you of
-	        your appointment.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry> 
-	    <term><guilabel>Audio:</guilabel></term>
-	    <listitem>
-	      <para>
-	        Choose this to have your computer deliver a sound
-	        alarm.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Program:</guilabel></term>
-	    <listitem>
-	      <para>
-	        Select this if you would like to run a program as a
-	        reminder.  You can enter its name in the text field,
-	        or find it with the <guibutton>Browse</guibutton>
-	        button.
-              </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	    
-      </para>
-      <para>
-         <guilabel>Classification</guilabel> 
-         only applies to calendars on a
-         network. <guilabel>Public</guilabel> is the default category,
-         and a public appointment can be viewed by anyone on the calendar
-         sharing network.  <guilabel>Private</guilabel> denotes one
-         level of security, and <guilabel>Confidential</guilabel> an even 
-         higher level.
-      </para>
-      <para>
-	<application>Evolution</application> can handle not only time that you're busy, but free time. This can be useful if you're on a network sharing calendar files.  You can easily compare schedules with other people, allowing easy setup of a RSVP.
-      </para>
-      <para>
-	To set your appointment to be free or busy, simply click the box in the <guilabel>Show Time As</guilabel> section in the <guilabel>Appointment Editor</guilabel>.
-      </para>
-      <para>
-        <application>Evolution</application> lets you categorize your
-	appointments, which can help if you lead a busy life.  The bottom
-	section of the <guilabel>Appointment</guilabel> tab is where your
-	categorization is done.
-      </para>
-      
-      <tip>
-      <title>Adding a New Appointment Category</title>
-	<para>
-	 You can add a new category to your category list by clicking on
-         <guibutton>Edit Master Category List</guibutton> and single-clicking
-	 on <guilabel> Click here to add a category</guilabel>.
-	</para>
-      </tip>
-
-      <para>
-	 The purpose of categories is to let you view all appointments which have
-	 similar activities.  To do this, change <guilabel>Any field contains</guilabel>
-	 to <guilabel>Has category</guilabel> and enter your category at right.
-      </para>
-
-      <para>
-	Clicking on the <guibutton>Categories</guibutton> button opens up the category
-	list.  To associate a category to an appointment, simply click the check box. 
-      </para>
-      <para>
-	Once you've selected your categories, click <guibutton>OK</guibutton> to
-	assign these categories to the appointment.  The categories you selected are now
-	listed in the text box to the right of the <guibutton>Categories...</guibutton>
-	button.
-      </para>
-
-      <para>
-        The <guilabel>Recurrence</guilabel> tab lets you describe
-        repetition in appointments ranging from once every day up to once
-        every 100 years.  You can then choose a time and date when the
-        appointment will stop recurring, and, under
-        <guilabel>Exceptions</guilabel>, pick individual days when the
-        appointment will <emphasis>not</emphasis> recur. Make your
-        selections from left to right, and you'll form a sentence:
-        "Every two weeks on Monday and Friday until January 3, 2003"
-        or "Every month on the first Friday for 12 occurrences."
-      </para>
-
-      <para>
-	Once you're done with all those settings, click on the disk
-	icon in the toolbar to save and close the appointment editor window. 
-	If you want, you can alter an appointment
-	summary in the calendar view by clicking on it and typing. You
-	can change other settings by right-clicking on the appointment then
-	choosing <guimenuitem>Edit this Appointment</guimenuitem>.
-      </para>
-    </sect2>
-    <sect2 id="usage-calendar-rsvp">
-      <title>Sending an RSVP with the Calendar</title>
-      <para>
-	<application>Evolution</application> can be used to schedule
-	group meetings and help you manage responses to meeting
-	requests.
-      </para>
-      <para>
-	When you create a meeting or group appointment, you can
-	specify the attendees in several categories, such as "chair"
-	or "required."  When you save the appointment listing, each
-	attendee will be sent an email with the appointment
-	information and gives them the option to respond.
-      </para>
-      <para>
-	To schedule a meeting:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select
-	      <menuchoice>
-		<guimenu>Actions</guimenu> <guimenuitem>Schedule
-		Meeting</guimenuitem> </menuchoice>.  The
-		<guilabel>Scheduling</guilabel> and
-		<guilabel>Meeting</guilabel> tabs open.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      If you have multiple Evolution identities, choose the
-	      one you'll use by selecting an item in the
-	      <guilabel>Sent By</guilabel> field.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the space labelled <guilabel>Click here to add an
-	      attendee</guilabel> to enter the names and email
-	      addresses of people you will invite, or click the
-	      <guibutton>Invite Others</guibutton> to select them from
-	      your addressbook.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Save the Appointment.
-	    </para>
-	  </listitem>
-	</orderedlist>
-	An email is now sent out to all the recipients, inviting them to your event.
-      </para>
-    </sect2>
-    <sect2 id="replying-to-rsvp">
-      <title>Replying to a Meeting Request</title>
-      <para>
-	Meeting requests are sent as iCal attachments.  To view or
-	respond to one, click on the attachment icon and view it
-	inline in the mail window.  All the details are shown about
-	the event including time and dates.  Then you can choose how
-	to reply to the RSVP.  Your choices are:
-	<itemizedlist>
-	  <listitem>
-	    <para>
-	      Accept
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Tentatively Accept
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Decline
-	    </para>
-	  </listitem>
-	</itemizedlist>
-	Click <guibutton>OK</guibutton> and an email will be sent to
-	the organizer with your answer.  The event will also be added
-	to your calendar if you accept.
-      </para>
-    </sect2>
-
-    <sect2 id="recieving-rsvp-response">
-      <title>Getting Responses to Meeting Requests</title>
-      <para>
-	Once you get a reply to your meeting invitation, you'll need
-	to view it inline in the email.  Click the attachment and
-	select <guibutton>View Inline</guibutton>.  At the bottom, you
-	can click <guibutton>OK</guibutton> to update your attendee
-	list.
-      </para>
-    </sect2>
-
-<!-- ############UNIMPLEMENTED FEATURES ###################
-
-    <sect2 id="usage-calendar-apts-group">
-      <title>Appointments for Groups</title>
-      <para>
-	You can use <application>Evolution</application> to mark a
-	meeting request on another person's calendar.  To do it, click
-	<guibutton>New</guibutton> in the calendar toolbar, or select
-	<menuchoice> <guimenu>File</guimenu>
-	<guisubmenu>New</guisubmenu>
-	<guimenuitem>Appointment</guimenuitem> </menuchoice> to bring
-	up the <interface>new appointment</interface> window.  Then
-	describe the appointment as you would any other. When you are
-	ready to send the invitation <guibutton>OK</guibutton>
-	<application>Evolution</application> will automatically send
-	email to each person on the request list, notifying of the
-	time and date of the meeting you have requested with them.  In
-	addition, it will mark the appointment on your calendar and on
-	theirs as tentative, rather than a confirmed, appointment.
-      </para>
-      <para>
-	To mark a tentative appointment as confirmed, click once on the
-	appointment in the <interface>calendar view</interface> to select
-	it, and then choose <guimenuitem>Appointment
-	Properties</guimenuitem> from the <guimenu>Settings</guimenu>
-	menu.  In the <interface>Appointment Properties</interface> dialog
-	window, click the "tentative" button to De-select the
-	appointment.
-      </para>
-      <para>
-        When your meeting attendees get the email inviting them to the
-        meeting, they'll be able to enter the information into their
-        calendars and let you know if they'll be able to attend; if
-        they use <application>Ximian Evolution</application> or
-        another iCal compliant mail client, they can do this with just
-        one click. When you get a response from them, it will include
-        an iCal attachment. Opening and accepting this attachment will
-        change the meeting data in your calendar to indicate that they
-        have responded to your invitation, and whether they will be in
-        attendance.
-     </para>
-    </sect2>
-
-
-    <sect2 id="usage-calendar-apts-privs">
-      <title>Scheduling privileges</title>
-      <para>
-	There are several levels of scheduling privileges.  You
-	can set whether people can see your calendar, whether they
-	can request meetings or appointments, and whether they can
-	create appointments.  This section may have to be deleted,
-	because I don't know if we are going to support privileges
-	at all.
-      </para>
-    </sect2>
- ########## END UNIMPLEMENTED FEATURESET ############ -->
-
-  </sect1>
-
-  <sect1 id="usage-calendar-todo">
-   <title>The Task Pad</title>
-    <para>
-       The Task Pad, located in the lower right corner of the
-       calendar, lets you keep a list of tasks separate from your
-       calendar appointments.  You can use the list
-       in a larger window by choosing the <guibutton>Tasks</guibutton>
-       button in the shortcut bar or in the folder tree.
-    </para>
-    <para>
-       To record a new task, click the <guibutton>Add</guibutton>
-       button in the toolbar.  <application>Evolution</application>
-       will pop up a small window with five items in it:
-     
-        <variablelist>
-	<varlistentry>
-	  <term> <guilabel>Summary:</guilabel></term>
-	  <listitem>
-            <para>
-              The description you enter here will appear in the To Do
-              list itself.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	
-	<varlistentry>
-	  <term> <guilabel>Due Date:</guilabel></term>
-	  <listitem>
-	    <para>
-	      Decide when this item is
-	      due.  You can either type in a date and time, or select one from
-	      the <guibutton>Calendar</guibutton> and time drop-down menus.
-          </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Start Date:</guilabel></term>
-	  <listitem>
-	    <para>
-	      The date you intend to start working.
-	    </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term> <guilabel>Description:</guilabel></term>
-	  <listitem>
-	    <para>
-              If you wish, you can keep a more detailed description of
-              the item here. For example, you can note that a task is
-              in progress, and display how close it is to completion.
-            </para>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term><guilabel>Classification:</guilabel></term>
-	  <listitem>
-	    <para>
-	      Sets who will see it if your calendar is shared.
-	    </para>
-	  </listitem>
-	</varlistentry>
-      </variablelist>
-    </para>
-    <para>
-      There are more options in the <guilabel>Details</guilabel> tab such as priority and progress settings.
-    </para>
-    <para>
-       Once you've added a task to your to-do list, its summary
-       appears in the <guilabel>Summary</guilabel> section of task
-       list.  To view or edit a detailed description of an item,
-       double-click on it, or right click on it and select <guibutton>Open</guibutton>.  You can delete items by selecting
-       them and clicking on the <guibutton>Delete</guibutton> button.
-    </para>
-    <para>
-      The list of tasks is sorted in a similar way to the list of
-      email messages in <application>Ximian Evolution
-      Mail</application>.  Click once on the message headers to change
-      the direction and type of sorting, or right-click to add or
-      remove columns from the display.
-    </para>
-    <sect2 id="task-folders">
-      <title>Folders for Your Tasks</title>
-      <para>
-	Like any other component in
-	<application>Evolution</application>, you can create a folder
-	to help organize your tasks.  To do this:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Open the <guilabel>Folders Bar</guilabel>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>Tasks</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Right click on <guibutton>Tasks</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <menuchoice><guimenuitem>Create New Folder</guimenuitem></menuchoice>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Enter the folder name.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>OK</guibutton>
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="usage-calendar-multiple">
-    <title>Multiple Calendars</title>
-    <para>
-       <application>Evolution</application> permits you to have and
-       maintain multiple calendars.  This is useful if you maintain
-       schedules for other people, if you are responsible for resource
-       or room allocation, or if you have multiple personalities.
-    </para>
-   
-    <example>
-      <title>Keeping Multiple Calendars</title>
-      <para>
-        Lucy, the office manager for a small company, has one calendar
-        for her own schedule. She maintains one for the conference
-        room, to schedule meetings.  Next to that, she maintains a
-        calendar that reflects when consultants are going to be on
-        site, and another that keeps track of when the Cubs are
-        playing.
-      </para>
-    </example>
-    <para>
-      To create a new calendar, select 
-      <menuchoice>
-	<guimenu>File</guimenu> <guisubmenu>New</guisubmenu>
-	<guimenuitem>Folder</guimenuitem>
-      </menuchoice>.
-       You'll need to tell the <guilabel>New Folder</guilabel> dialog that the new folder should be of the calendar type.  You can place the calendar in any calendar folder and access it
-       from the folder view.
-    </para>
-    <para>
-       Each calendar folder can hold only one calendar.
-    </para>
-  </sect1>
-</chapter>
diff --git a/help/no/usage-contact.sgml b/help/no/usage-contact.sgml
deleted file mode 100644
index dc11b4bd0a..0000000000
--- a/help/no/usage-contact.sgml
+++ /dev/null
@@ -1,609 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-<chapter id="usage-contact">
-  <title>Working with Your Contacts</title>
-      <para>
-        This chapter will show you how to use the
-        <application>Evolution</application> addressbook to organize
-        any amount of contact information, share addresses over a
-        network, and several ways to save time with everyday tasks. To
-        learn about configuring the addressbook, see <xref
-        linkend="config-prefs-contact">. You can import contacts from
-        other contact management tools with the Import tool by
-        selecting
-        <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice>,
-        or by mailing them to yourself as vCard attachments.
-      </para>
-
-    <para>
-       The toolbar for the addressbook is quite simple.
-       <itemizedlist>
-	<listitem><para>
-           Click <guibutton>New Contact</guibutton> to create a new card, or double-click 
-           in a blank space in the contact list. 
-	</para></listitem>
-
-	<listitem><para>
-           Click <guibutton>New List</guibutton> to create a new card, or double-click 
-           in a blank space in the contact list. 
-	</para></listitem>
-
-	<listitem><para> The <guiicon>printer</guiicon> icon sends one
-	    or more of your cards to the printer.  </para></listitem>
-
-        <listitem><para> The <guiicon>stop sign</guiicon> icon stops loading
-           contact data from the network.  This button is only
-           relevant if you are looking at contact information on a
-           network.  </para></listitem>
-      </itemizedlist>
-    </para>
-
-    <para>
-       Your contact information fills the rest of the display.  Move
-       through the cards alphabetically with the buttons and the
-       scrollbar to the right of the window. Of course, if you have
-       more than a few people listed, you'll want some way of finding
-       them more quickly, which is why there's a search feature.
-    </para>
-
-  <sect1 id="usage-contact-cards">
-    <title>The Contact Editor</title>
-    <para>
-      To delete a contact:
-      <orderedlist numeration="arabic">
-	<listitem>
-	  <para>
-	    Click once on the contact.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Press the <guibutton>Delete</guibutton> button.
-	  </para>
-	</listitem>
-      </orderedlist>
-    </para>
-    <para>
-       If you want to add or change cards, you'll use the contact
-       editor.  To change a card that already exists, double click on
-       it to open the contact editor window.  If you want to create a new
-       card, clicking the <guibutton>New</guibutton> button in the
-       toolbar will open the same window, with blank entry boxes for
-       you to fill in.
-    </para>
-    
-    <para>
-      The contact editor window has two tabs,
-      <guilabel>General</guilabel>, for basic contact information, and
-      <guilabel>Details</guilabel>, for a more specific description of
-      the person.  In addition, it contains a <guimenu>File</guimenu>
-      menu and a toolbar with three items: <guilabel>Save and
-      Close</guilabel>, <guilabel>Print</guilabel>, and
-      <guilabel>Delete</guilabel>.
-      </para>
-    
-    <figure id="usage-contact-editor-fig">
-      <title>Evolution Contact Editor</title>
-      <screenshot>
-	<screeninfo>Evolution Contact Editor</screeninfo>
-	<mediaobject><imageobject><imagedata
-	fileref="figures/contact-editor" format="png" srccredit="Aaron
-	Weber">
-	</imageobject></mediaobject>
-      </screenshot>
-    </figure>
-    
-    <para> The <guilabel>General</guilabel> tab has seven sections,
-      each with an icon: a face, for name and company; a telephone
-      for phone numbers; an envelope for email address; a globe for
-      web page address; a house for postal address; a file folder
-      for contacts, and a briefcase for categories. 
-    </para>
-    <para>
-     <variablelist>
-	
-	<varlistentry>
-	  <term>Full Name</term>
-	  <listitem>
-	    <para>
-              The <guilabel>Full Name</guilabel> field has two
-              major features:
-              <itemizedlist>
-		<listitem>
-		  <para>
-                    You can enter a name into the <guibutton>Full
-                    Name</guibutton> field, but you can also click the
-                    <guibutton>Full Name</guibutton> button to bring
-                    up a small dialog box with a few text boxes
-                    <variablelist>
-		      <varlistentry>
-			<term><guilabel>Title: </guilabel></term>
-			<listitem> <para>
-	                  Enter an honorific or select one from the menu.
-	                </para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>First: </guilabel></term>
-			<listitem> <para>
-		            Enter the first, or given, name.
-			 </para></listitem> 
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Middle: </guilabel></term>
-			<listitem> <para>
-			  Enter the middle name or initial, if any.
-			</para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Last: </guilabel></term>
-			<listitem> <para>
-			   Enter the last name (surname).
-			 </para></listitem>
-		      </varlistentry>
-		      <varlistentry>
-			<term><guilabel>Suffix: </guilabel></term>
-			<listitem> <para>
-			   Enter suffixes such as "Jr." or "III."
-			</para></listitem>
-		      </varlistentry>
-		    </variablelist>
-                   </para>
-		</listitem>
-	      </itemizedlist>
-	      </para>
-		<para>
-		  The <guilabel>Full Name</guilabel> field also
-		  interacts with the <guilabel>File As</guilabel>
-		  box to help you organize your contacts.
-		</para>
-	    <para>
-		  To see how it works, type a name in the
-		  <guilabel>Full Name</guilabel> field. As an example,
-		  we'll use the Ximian mascot, <userinput>Rupert
-		  T. Monkey</userinput>.  You'll notice that the
-		  <guilabel>File As</guilabel> field also fills in,
-		  but in reverse: <computeroutput>Monkey,
-		  Rupert</computeroutput>.  You can pick
-		  <computeroutput>Rupert Monkey </computeroutput> from
-		  the drop-down, or type in your own, such as
-		  <userinput> T. Rupert Monkey </userinput>.
-		</para>
-	    <tip>
-	      <title>Filing Suggestion</title>
-	      <para>
-		 Don't enter something entirely different from the
-		 actual name, since you might forget that you've filed
-		 Rupert's information under "F" for "Fictitious Ximian
-		 Employee."
-              </para>
-	    </tip>
-	  </listitem>
-	</varlistentry>
-	<varlistentry>
-	  <term>Multiple Values for Fields:</term>
-            <listitem>
-	      <para>
-                If you click on the downward pointing triangle buttons
-                next to the <guilabel>Primary Email</guilabel> field,
-                you can also choose <guilabel>Email 2</guilabel> and
-                <guilabel>Email 3</guilabel>.  Although the contact
-                editor will only display one of those at any given
-                time, <application>Evolution</application> will store
-                them all.  Entries that have information in them have
-                a check mark next to them.  The buttons next to the
-                telephone and postal address fields work in the same
-                way.
-              </para>
-          </listitem>
-	</varlistentry>
-      </variablelist>
-     </para>
-     <para>
-      The last item in the <guilabel>General</guilabel> tab is the
-       <guilabel>Categories</guilabel> organization tool; for
-       information on that, read <xref
-       linkend="usage-contact-organize">.
-     </para>
-     <para>
-       The <guilabel>Details</guilabel> tab is much simpler:
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    The briefcase - Describes the person's professional life
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    The face - Describes the person's personal life
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    The globe - Miscellanious notes
-	  </para>
-	</listitem>
-      </itemizedlist>
-
-      <tip>
-	<title>Contact Shortcuts</title>
-	<para>
-	  You can add cards from within an email message or calendar
-	  appointment.  While looking at an email, right-click on
-	  any email address or message, and choose
-	  <guimenuitem>Create Card for this Address</guimenuitem> or
-	  <guimenuitem>Create Card for this Sender</guimenuitem>
-	  from the menu.
-	</para>
-      </tip>
-    </para>
-  </sect1>
-
-  <sect1 id="contact-search">
-    <title>Searching for Contacts</title>
-    <para>
-      <application>Evolution</application> allows searching through contacts
-      quickly and easily.
-    </para>
-    <para>
-      To search through contacts:
-      <orderedlist numeration="arabic">
-	<listitem>
-	  <para>
-	    Select your search focus in the search bar.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Enter your query.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Press return to search.
-	  </para>
-	</listitem>
-      </orderedlist>
-    </para>
-    <para>
-      You can refine searches by doing several in
-      succession, or start over by pressing the <guibutton>Show
-	All</guibutton> button.
-    </para>
-    <para>
-      If there are no matches, the card display will be
-      blank. When you'd like to see all the cards again, press
-      <guilabel>Show All</guilabel>.
-    </para>
-    <example id="contact-quicksearch-ex">
-      <title>Refining a Quick Search</title>
-      <para>
-	Tom comes back from lunch and finds a note on his
-	keyboard: "Curtis in sales called for you, but he didn't
-	leave a number, and I forgot to write down the name of the
-	company he works for. He said it was important, though."
-	Tom is not at all annoyed.
-      </para>
-      <para>
-	He opens his contacts folder, and runs a quick search for
-	"Curtis." There are eighteen different people with that name
-	in the file. He then enters "Sales," and
-	<application>Evolution</application> narrows it down to the
-	right Curtis. He only becomes annoyed when he discovers that
-	the call was not actually important.
-      </para>
-    </example>
-    
-    <para>
-      To perform a complex search through your contacts:
-      <orderedlist numeration="arabic">
-	<listitem>
-	  <para>
-	    Open
-	    <menuchoice>
-	      <guimenu>Tools</guimenu>
-	      <guimenuitem>Search for contacts</guimenuitem>
-	    </menuchoice>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Name the rule in the <guilabel>Rule Name</guilabel> field.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Setup your criteria information in the <guilabel>If</guilabel> section.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    If you want to add more critera, click the <guibutton>Add
-	    Criterion</guibutton> button.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Click <guibutton>Search</guibutton>.
-	  </para>
-	</listitem>
-      </orderedlist>
-    </para>
-    <para>
-      To show all your contacts, select <guibutton>Show All</guibutton> in the
-      <guilabel>Search Bar</guilabel> or search with an empty query.
-    </para>
-
-  </sect1>
-
-  <sect1 id="usage-contact-organize">
-    <title>Organizing your Addressbook</title>
-    <para>
-       Organizing your addressbook is a lot like organizing your
-       mail.  You can have folders and searches the same way you can
-       with mail, but the addressbook does not allow Virtual Folders.  It
-       does, however, allow each card to fall under several
-       categories, and allow you to create your own categories.  To
-       learn about categories, read <xref
-       linkend="usage-contact-organize-group-category">.
-    </para>
-
-<!-- UNIMPLEMENTED FEATURE
-    <para>
-      Another useful <application>Evolution</application> feature is
-      its ability to recognize when people live or work together.  If
-      several people in your addressbook share an address, and you
-      change the address for one of them,
-      <application>Evolution</application> will ask you if you wish to
-      change the address for all of them, or just for one.
-    </para>
--->
-
-    <sect2 id="usage-contact-organize-group">
-      <title>Groups of contacts</title>
-      <para>
-         <application>Evolution</application> offers two ways for you
-         to organize your cards.  The first way is to use folders;
-         this works the same way mail folders do.  For more
-         flexibility, you can also mark contacts as elements of
-         different categories.  To better integrate with email tools,
-         you can also create lists of contacts that you can send mail
-         to as a single person.
-      </para>
-
-      <sect3 id="usage-contact-organize-group-folder">
-	<title>Grouping with Folders</title>
-	<para>
-	   The simplest way to group address cards is to use folders.
-	   By default, cards start in the
-	   <guilabel>Contacts</guilabel> folder.  If you've read <xref
-	   linkend="usage-mainwindow"> then you already know that you
-	   can create a new folder by selecting 
-           <menuchoice>
-           <guimenu>File</guimenu>
-	   <guisubmenu>New</guisubmenu>
-	   <guimenuitem>Folder</guimenuitem>
-           </menuchoice>
-           and that you can put new folders anywhere you like. Just
-	   like with mail, cards must be in a card folder, and no card
-	   can be in two places at once.  If you want more
-	   flexibility, try <xref
-	   linkend="usage-contact-organize-group-category">.
-	 </para>
-	<para>
-          To put a card into a folder, just drag it there from the
-          folder view.  Remember that contact cards can only go in
-          contact folders, just like mail can only go in mail folders,
-          and calendars in calendar folders.
-         </para>
-      </sect3>
-      
-      <sect3 id="usage-contact-organize-group-category">
-	<title>Grouping with Categories</title>
-	<para>
-           The other way to group cards is to mark them as belonging
-           to different categories.  
-           That means that you
-           can mark a card as being in several categories or no
-           category at all.  For example, I put my friend Matthew's
-           card in the "Business" category, because he works with me,
-           the "Friends" category, because he's also my friend, and
-           the "Frequent" category, because I call him all the time
-           and can never remember his phone number.  
-        </para>
-	<para>
-           To mark a card as belonging to a category, click the
-           <guibutton>Categories</guibutton> button at the lower
-           right.  From the dialog box that appears, you can check as
-           many or as few categories as you like.
-        </para>
-
-       <!-- Feature Not Implemented
-	<para>
-
-           If the master list of categories doesn't suit you, you can
-           add your own.  Just enter the new category's name in the
-           text box, then click <guibutton>Categories</guibutton> and
-           choose <guilabel>Add to Master List</guilabel> in the
-           window that appears. 
-         </para>
-       -->
-
-      </sect3>
-
-      <sect3 id="usage-contact-organize-group-list">
-	<title>Creating a List of Contacts</title>
-	<para>
-           To create a list of contacts:
-
-         <orderedlist numeration="arabic">
-	    <listitem>
-	      <para>
-                Open the list creation dialog box by clicking the
-                <guibutton>New List</guibutton> button or selecting
-                 <menuchoice>
-		  <guimenu>
-                     File
-                  </guimenu>
-		  <guisubmenu>
-                      New
-                   </guisubmenu>
-		  <guimenuitem>
-                     Contact List
-                   </guimenuitem>
-		</menuchoice>.
-               </para>
-	    </listitem>
-	    
-	    <listitem>
-	      <para>
-                Enter a name for the list.
-              </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-                Enter names or email addresses of contacts, or just
-	        drag contacts from the main window into the list.
-              </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-                 Choose whether you would like to hide the email
-                 addresses when you send a message to the list.
-                 Unless it is a very small list, it is recommended
-                 that you leave the addresses hidden.  This is the
-                 same thing as using the "Bcc:" feature discussed in
-                 <xref linkend="usage-mail-getnsend-send-to-types">.
-              </para>
-	    </listitem>
-	    
-	  </orderedlist>
-        </para>
-	<para>
-           When you are done, click <guibutton>OK</guibutton>. The
-           list will appear as a contact card, which you can use as
-           you would any other. That includes emailing the list to
-           another person, and, of course, sending email to the list.
-        </para>
-	<para>
-           To mail the list, open a new email and type the name you
-           chose for the list. Ximian Evolution will address the
-           message to the entire list when you send it. You can also
-           right-click on the list's address card in the Addressbook
-           and select <guimenuitem>Send Message to List</guimenuitem>.
-        </para>
-      </sect3>
-
-
-    </sect2>
-  </sect1>
-  
-<!-- we need a LDAP server up for me to test this -->
-  <sect1 id="usage-contact-sharing">
-    <title>Sharing your Cards</title>
-    <para>
-       If you keep your cards on a network using an <glossterm
-       linkend="ldap">LDAP</glossterm> server, you can share access to
-       them, browse other peoples addressbooks, or maintain a shared set of
-       contact information for your company or your department.  This
-       is the sort of feature you'll want to use if your company has a
-       list of vendors and clients that needs constant updating.  If
-       you share calendars as well as addressbooks, people can avoid
-       duplicating work and keep up to date on developments within
-       their workgroup or across the entire company.
-    </para>
-
-     <example id="usage-contact-sharing-ex">
-	<title>Sharing Address Cards and Calendar Data</title>
-	  <para>
-	    Ray wants to schedule a meeting with Company X, so he
-	    checks the network for the Company X address card so he
-	    knows whom to call there.  Since his company also shares
-	    calendars, he then learns that his co-worker Deanna has
-	    already scheduled a meeting with Company X next Thursday.
-	    He can either go to the meeting himself or ask Deanna to
-	    discuss his concerns for him.  Either way, he avoids
-	    scheduling an extra meeting with Company X. 
-	 </para>
-      </example>
-    <para>
-       Of course, you don't want to share all of your cards&mdash; why
-       overload the network with a list of babysitters or tell
-       everyone in the office you're talking to new job prospects?  If
-       you keep cards on your own computer, you can decide which items
-       you want to make accessible to others.
-    </para>
-    <para>
-       To learn how to add a remote directory to your available
-       contact folders, see <xref linkend="config-prefs-contact">.
-       Once you have a connection, the network contacts folder or
-       folders will appear inside the <guilabel>External
-       Directories</guilabel> folder in the folder bar.  It will work
-       exactly like a local folder of cards, with the following
-       exceptions:
-       <itemizedlist>
-
-          <listitem>
-	  <para>
-              Network folders are only available when you are
-              connected to the network.  If you use a laptop or have a
-              modem connection, you may wish to copy or cache the
-              network directory.  You do this by dragging and dropping your desired contacts into the local contacts list.
-	  </para>
-	  </listitem>
-
-          <listitem>
-	  <para>
-              To prevent excess network traffic,
-              <application>Evolution</application> will not normally
-              load the contents of LDAP folders immediately upon
-              opening.  You must click <guilabel>Display
-              All</guilabel> before LDAP folder cards will be loaded
-              from the network. You can change this behavior in the
-              <interface>Contact Preferences</interface> window.
-          </para>
-	  </listitem>
-	  <listitem>
-	  <para>
-              Your ability to view, change, add, and delete contacts
-              depends on the settings of the LDAP server. 
-          </para>
-	  </listitem>
-       </itemizedlist>
-     </para>
-  </sect1>
-
-    <sect1 id="contact-automation-basic">
-      <title>Send me a Card: Adding New Cards Quickly</title>
-      <para>
-	As noted before, when you get information about a person in
-	the mail or in a calendar entry, you can add it to an address
-	card.  To do so, right click on any email address or email
-	message, and select <guimenuitem>Add Address
-	Card</guimenuitem> from the menu that appears.  Of course,
-	<application> Evolution</application> can also add cards from a
-	hand-held device during HotSync operation.  For more
-	information about that, see <xref linkend="usage-sync">.
-      </para>
-    </sect1>
-
-<!-- Unimplemented features:
-      <para>
-         You can also use the addressbook to print postal addresses
-	 on mailing labels.  Future versions of
-	 <application>Evolution</application> will allow you to you
-	 export a group of cards to a spreadsheet, database, or word
-	 processor so you can print address labels or prepare large
-	 mailings.
-      </para>
-  <para>
-    Need a map or directions? Click <guibutton>MapIt</guibutton> from
-  within the addressbook, and <application>Evolution</application>
-  will map the address for you online.
-  </para>
-  -->
-    
-    
-
-</chapter> 
diff --git a/help/no/usage-encryption.sgml b/help/no/usage-encryption.sgml
deleted file mode 100644
index e36f17c652..0000000000
--- a/help/no/usage-encryption.sgml
+++ /dev/null
@@ -1,147 +0,0 @@
-<!DOCTYPE article PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[]>
-
-<article>
-  
-  <sect1 id="encryption-intro">
-    <title>What is Encryption?</title>
-    <para>
-      Encryption is an ancient method of changing readable text to unreadable
-      text that dates back to Egyptian times.  Encryption takes the statement
-      "Evolution" and turns it into something which cannot be read without help
-      through decryption.
-      <example>
-	<title>Encryption Example</title>
-	<para>
-	  Kevin orders an <application>Evolution</application> t-shirt from
-	  Ximian, Inc. over the internet.  He puts in his credit card number
-	  which is 1234-567-8901.  For security, his computer encrypts the
-	  credit card number so it can be safely transmitted over the internet.
-	  The number now is @#$23ui7yr87#@!48970fsd, which holds no intentional
-	  resemblance to the inital number.  When the information gets to
-	  Ximian, Inc. it'll be decrypted into the inital number.
-	</para>
-      </example>
-      Encryption can be used in email in two ways: to verify that the sender is
-      the real sender, and to hide the message while in transmission.
-      <application>Evolution</application> has the capability to do both.  
-    </para>
-  </sect1>
-  <sect1 id="generating-key">
-    <title>Generating your PGP key</title>
-    <para>
-      First, you need to create a PGP key.  To do this, you'll need GPG
-      installed.
-    </para>
-    <tip>
-      <title>GPG Versions</title>
-      <para>
-	This manual covers version 1.0.6 of GPG.  If your version is different,
-	this may not be entirely accurate.  You may find out your version number
-	by typing in: <command>gpg --version</command>.
-	</para>
-      </tip>
-    <para>
-      You can start by typing in: <command>gpg --gen-key</command>.  At the
-      first question, select 1.  The next question asks you about key length.
-      The longer the key, more stronger it is.  However, the longer the key, the
-      longer it takes to generate.  This is your choice.  However, 1024 bits
-      (default) should be adequate.  The next question asks you if you want your
-      key to expire.  Expiring keys make your key invalid after a certain amount
-      of time, so old keys don't float around active.  This is the same concept
-      as a coupon at a supermarket.  Next, you'll type in your Real name, your
-      email address, and a comment.  You should not forge this information, as
-      it is used later to verify who you are.  Assuming that all your
-      information is correct, press "O" to continue.  GPG now asks you for a
-      passphrase.  This is a password which you will need to decrypt and encrypt
-      messages.  This can be any length, with any characters in it.  It is case
-      sensitive, which means that it does know the difference between capital
-      letters and lower-case.  Now your key is generated.  It is recommend you
-      surf the internet, read your email, or write a letter in a word
-      processor.  This help creates randomness in the key.
-    </para>
-    <para>
-      Once this is completed, you'll be dropped back to the command line.
-      Now you can view your key information by typing <command>gpg
-      --list-keys</command>.  You should see something similar to this:
-      <example id="gpg-list-keys">
-	<title>GPG Listing Keys</title>
-	<para>
-	  /home/bob/.gnupg/pubring.gpg
-	  ----------------------------
-	  pub 1024D/32j38dk2 2001-06-20 bob &lt;bob@bob.com&gt;
-	  sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]
-	</para>
-      </example>
-      You'll now need to upload your public key to a keyserver, so that your
-      friends can use your key.  You'll need to know the ID of your key, which
-      is after the 1024D on the line beginning with pub.  For this example, it
-      is 32j38dk2.  You now type in <command>gpg --send-keys --keyserver
-      wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for 32j38dk2.
-      You will be prompted to type in your password <!-- verify that you need to
-      enter your password here --> and your key will be uploaded for your
-      friends to download.
-    </para>
-  </sect1>
-  <sect1 id="encrypt-evo-integ">
-    <title>Setting up Evolution's Encryption</title>
-    <para>
-      You'll need to open
-      <menuchoice>
-	<guimenu>Tools</guimenu>
-	<guimenuitem>Mail Settings</guimenuitem>
-      </menuchoice>
-     Once there, select the account you'd like to associate the key to and click
-     the <guibutton>Edit</guibutton> button.  In the
-     <guilabel>Security</guilabel> tab is a section labeled <guilabel>Pretty
-     Goog Privacy</guilabel>.  Enter your key ID and click
-     <guibutton>OK</guibutton>.  Your key is now integrated into your identity
-     in <application>Evolution</application>.
-    </para>
-  </sect1>
-  <sect1 id="encrypt-sending">
-    <title>Sending Encrypted Messages</title>
-    <para>
-      You can either sign or encrypt a message.  When you sign a message, verify
-      that you were the one who sent it, and that no one is forging your
-      identity.  Encrypting a message makes it impossible for someone with
-      prying eyes to view it while it's in tranmission.
-    </para>
-    <para>
-      <sect2 id="sign-msg">
-	<title>Signing a Message</title>
-	<para>
-	  To sign a message, you simply click
-	  <menuchoice>
-	    <guimenu>Security</guimenu>
-	    <guimenuitem>PGP Sign</guimenuitem>
-	  </menuchoice>
-	  .  You will be prompted for your PGP password.  Once you enter it,
-	  click <guibutton>OK</guibutton> and your message will be signed.
-	</para>
-      </sect2>
-      <sect2 id="encrypt-msg">
-	<title>Encrypting a Message</title>
-	<para>
-	  Encrypting a message is very similar to signing a message.  You simply
-	  click the menu item 
-	  <menuchoice>
-	    <guimenu>Security</guimenu>
-	    <guimenuitem>PGP Encrypt</guimenuitem>
-	  </menuchoice>
-	</para>
-      </sect2>
-    </para>
-  </sect1>
-  <sect1 id="unencrypting">
-    <title>Unencrypting a Recieved Message</title>
-    <para>
-      Sometimes, a friend will send you a message which is encrypted.  In order
-      for you to read it, you need to unencrypt it.
-    </para>
-    <para>
-      When you view the encrypted message, <application>Evolution</application>
-      will prompt you for your PGP password.  You type in your PGP password and
-      the message is then decrypted.
-    </para>
-  </sect1>
-  </article>
diff --git a/help/no/usage-exec-summary.sgml b/help/no/usage-exec-summary.sgml
deleted file mode 100644
index e16da21579..0000000000
--- a/help/no/usage-exec-summary.sgml
+++ /dev/null
@@ -1,315 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-<chapter id="usage-summary">
-  <title>Getting Oriented with the Ximian Evolution Summary</title>
-  
-  <sect1 id="summary-intro">
-    <title>Using the Summary</title>
-    <para>
-      The Ximian Evolution Summary can show you what you need to know
-      quickly.  It will show you your tasks for that day, how many
-      emails are waiting for you, and much more.
-    </para>
-    <para>
-      To begin using your Summary, click on the <guilabel>Shortcut
-      Bar</guilabel> or <guilabel>Summary</guilabel> at the top of the
-      <guilabel>Folder Bar</guilabel>.  By default, you will see:
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    Weather Reports
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    News feeds from the Internet
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Mail summary
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Appointments
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Tasks
-	  </para>
-	</listitem>
-      </itemizedlist>
-    </para>
-  </sect1>
-  <sect1 id="customizing-summary">
-    <title>Customizing the Summary's Modules</title>
-    <para>
-      <application>Evolution's</application> modules can be customized
-      to suit your needs.  For example, you can choose which mail
-      boxes are summarized, and which news services appear.
-    </para>
-
-
-  <note id="summary-http-proxy">
-	<title>Using the Summary through an HTTP Proxy</title>
-        <para>
-           If you use an HTTP proxy, <application>Ximian
-           Evolution</application> must be able to find it through the
-           <systemitem>gnome-vfs</systemitem> subsystem before it can
-           access news and weather from the Internet.  This is also
-           the case if you wish to load remote images into HTML mail
-           message.  You can tell the GNOME Virtual File System about
-           your HTTP proxy in one of two ways:
-            <variablelist>
-	    <varlistentry>
-	      <term>Configure it with Nautilus</term>
-	      <listitem>
-		<para>
-                 <orderedlist numeration="arabic">
-		    <listitem>
-		      <para>
-			Open a Nautilus window
-	               </para>
-		    </listitem>
-      		    <listitem>
-		      <para>
-	                 Select <menuchoice>
-			  <guimenu>Preferences</guimenu>
-			  <guimenuitem>Edit Preferences</guimenuitem>
-			</menuchoice>.
-	               </para>
-		    </listitem>
-      		    <listitem>
-		      <para>
-			Go to the <guilabel>Navigation</guilabel> tab.
-	               </para>
-		    </listitem>
-      		    <listitem>
-		      <para>
-			Click the <guilabel>Use HTTP Proxy</guilabel>
-			checkbox and enter the location of your HTTP
-			proxy in the <guilabel>Location</guilabel> field.
-	               </para>
-		    </listitem>
-		  </orderedlist>
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>Configure it with the gconftool command</term>
-	      <listitem>
-	      <para>
-                 <orderedlist numeration="arabic">
-		    <listitem>
-		      <para>
-                        Open a terminal.
-                      </para>
-		    </listitem>
-		    <listitem>
-		      <para>
-                        Enter the command 
-                        <command>
-                        gconftool --type=bool --set /system/gnome-vfs/use-http-proxy "TRUE"
-                        </command>
-                      </para>
-		    </listitem>
-		    <listitem>
-		      <para>
-                        Enter the command 
-                        <command>
-      gconftool --type=string --set /system/gnome-vfs/http-proxy-host "your-proxy-url"
-                        </command>
-                      </para>
-		    </listitem>
-		    <listitem>
-		      <para>
-                        Enter the command 
-                        <command>
-                        gconftool --type=int --set /system/gnome-vfs/http-proxy-port "8080"
-                        </command>                  
-                      </para>
-		    </listitem>
-		  </orderedlist>
-                </para>
-		<para>
-                  For more information about the gconftool command,
-                  read the gconftool man page.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-         </para>
-      </note>
-
-
-    <sect2 id="customizing-summary-weather">
-      <title>Customizing the Weather Summary</title>
-      <para>
-	To add a city to be displayed in the weather:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Click <guilabel>Summary</guilabel> in the <guilabel>Shortcut Bar</guilabel>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Summary Settings</guimenuitem>
-	      </menuchoice>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the <guilabel>Weather</guilabel> tab.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the city on the left hand column.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Add</guibutton> button.
-	    </para>
-	  </listitem>
-	</orderedlist>
-	<tip id="measurments">
-	  <title>Metric or Imperial?</title>
-	  <para>
-	    <application>Evolution</application> supports both
-	    Imperial and Metric measurement for weather
-	    reports. Imperial units are sometimes called British
-	    units, but are used almost exclusively in the United
-	    States. Britain, and most of the rest of the world, use
-	    metric units.
-	  </para>
-	</tip>
-      </para>
-    </sect2>
-    <sect2 id="customizing-feeds">
-      <title>Customizing Your News Feeds</title>
-      <para>
-	To customize your news feeds:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Click <guilabel>Summary</guilabel> in the <guilabel>Shortcut Bar</guilabel>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Summary Settings</guimenuitem>
-	      </menuchoice>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the <guilabel>News Feeds</guilabel> tab.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the news news feed on the left column.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Add</guibutton> button.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>OK</guibutton>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-    <sect2 id="customizing-mail">
-      <title>Customizing Your Mail Summary</title>
-      <para>
-	To customize your mail summary:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Click <guilabel>Summary</guilabel> in the <guilabel>Shortcut Bar</guilabel>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Summary Settings</guimenuitem>
-	      </menuchoice>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Mail</guibutton> tab.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the mail folder you want to see in the preview on the left.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>Add</guibutton>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-    <sect2 id="customizing-cal">
-      <title>Customizing Your Schedule Summary</title>
-      <para>
-	To customize your calendar summary:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Click <guilabel>Summary</guilabel> in the <guilabel>Shortcut Bar</guilabel>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Summary Settings</guimenuitem>
-	      </menuchoice>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Schedule</guibutton> tab.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Choose whether you'd like appointments displayed for one
-	      day, five days, a week, or a month.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-            Choose whether you'd like to display all tasks, or just
-            the tasks due today.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-  </sect1>
-</chapter>
\ No newline at end of file
diff --git a/help/no/usage-mail-org.sgml b/help/no/usage-mail-org.sgml
deleted file mode 100644
index ce6f75e69c..0000000000
--- a/help/no/usage-mail-org.sgml
+++ /dev/null
@@ -1,1021 +0,0 @@
-<chapter id="usage-mail-organize">
-    <title>Organizing and Managing your Email</title>
-    <para>
-      Even if you only get a few email messages a day, you probably
-      want to sort and organize them.  When you get a hundred a day
-      and you want to refer to a message you received six weeks ago,
-      you <emphasis>need</emphasis> to sort and organize them.
-      Fortunately, <application>Ximian Evolution</application> has the tools
-      to help you do it.
-    </para>
-
-  <sect1 id="importing-mail-and-settings">
-    <title>Importing Your Old Email and Settings</title>
-    <para>
-      <application>Evolution</application> allows you to import old email and data so that you don't need to worry about losing your old information.
-    </para>
-    <sect2 id="importing-mail">
-      <title>Importing Email</title>
-      <para>
-        <application>Ximian Evolution</application> can import the following types of
-        files:
-        <variablelist>
-          <varlistentry>
-            <term>VCard (.vcf, gcrd):</term>
-            <listitem>
-              <para>
-                The addressbook format used by the GNOME, KDE, and
-                many other contact management applications. You
-                should be able to export to VCard format from any
-                address book application.
-              </para>
-            </listitem>
-          </varlistentry>
-
-	  <varlistentry>
-	    <term>iCalendar (.ics):</term>
-	    <listitem>
-	      <para>
-		A format for storing calendar files.  iCalendar is used by 
-		PalmOS based handhelds, Ximian <application>Evolution</application>, and Microsoft <application>Outlook</application>.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-          <varlistentry>
-            <term>Microsoft Outlook Express 4 (.mbx):</term>
-            <listitem>
-              <para>
-                Email file format used by Microsoft Outlook Express
-                4. For other versions of Microsoft Outlook and Outlook Express, see
-                the workaround described in the note below.
-              </para>
-            </listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term>MBox (mbox):</term>
-            <listitem>
-              <para>
-                The email box format used by Mozilla, Netscape,
-                Ximian Evolution, Eudora, and many other email clients.
-              </para>
-            </listitem>
-          </varlistentry>
-        </variablelist>
-      </para>
-      <para>
-        To import your old email:
-        <orderedlist numeration="arabic">
-          <listitem>
-            <para>
-              Click <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice>.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Click <guibutton>Next</guibutton> after reading the Welcome screen.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Select <guibutton>Import a single file</guibutton>.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Find the file that you wish to import into <application>Evolution</application>.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Click <guibutton>Import</guibutton>
-            </para>
-          </listitem>
-        </orderedlist>
-      </para>
-    </sect2>
-    <sect2 id="importing-preferences">
-      <title>Importing Preferences</title>
-      <para>
-        <application>Evolution</application> can import all your old mail, contacts, and other information from other applications, making your transition to <application>Evolution</application> even easier.
-      </para>
-      <para>
-        To import your old information:
-        <orderedlist numeration="arabic">
-          <listitem>
-            <para>
-              Click <menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice>.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Click <guibutton>Next</guibutton> after reading the Welcome screen.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Select <guibutton>Import data and settings from older programs</guibutton>.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              The left-most column shows the application which your information will be imported from.  You then select checkboxes on each component to import different properties of each application.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Click <guibutton>Next</guibutton>
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Click <guibutton>Import</guibutton>
-            </para>
-          </listitem>
-        </orderedlist>
-      </para>
-
-<para>
-    <note>
-      <title>Microsoft Outlook and Outlook Express Users</title>
-      <para>
-	Microsoft Outlook, and versions of Outlook Express after
-	version 4, use proprietary formats that <application>Ximian
-	Evolution</application> cannot read or import.  For contacts,
-	you may have to email them to yourself and import them that
-	way.  For email, there is a simpler workaround:
-	<orderedlist numeration="arabic">
-
-	<listitem>
-	<para>
-	  While using Windows, import the files into Mozilla Mail (or
-	  another mailer, such as Netscape or Eudora, that uses the
-	  standard mbox format).
-        </para>
-        </listitem>
-	
-	<listitem>
-	<para>
-          Copy the files to the system or partition you use for
-          <application>Ximian Evolution</application>.  
-         </para>
-        </listitem>
-
-	<listitem>
-	<para>
-	  Use the <application>Ximian Evolution</application> import
-          tool to import the files.  There's more information about
-          why this works, and how, at the Ximian support website.
-      </para>
-        </listitem>
-     </orderedlist>
-    </para>
-    </note>     
-
-    <note>
-      <title>Netscape Users</title>
-      <para>
-	Before importing mail from Netscape, make sure you select
-	<menuchoice><guimenu>File</guimenu><guimenuitem>Compact All
-	Folders</guimenuitem></menuchoice>. If you don't,
-	<application>Ximian Evolution</application> will import and undelete
-	the messages in your Trash folders.
-      </para>
-    </note>     
-
-    </para>
-
-    </sect2>
-  </sect1>
-  <sect1 id="usage-mail-organize-columns">
-      <title>Sorting Mail with Column Headers</title>
-      <para>
-         By default, the message list has columns with the following
-         headings: an envelope icon indicating whether you have read
-         or replied to a message, an exclamation point indicating priority, and the
-         <guilabel>From</guilabel>, <guilabel>Subject</guilabel>, and
-         <guilabel>Date</guilabel> fields. You can change their order
-         and remove them by dragging and dropping them.  
-
-      To add columns:
-      <orderedlist numeration="arabic">
-	<listitem>
-	  <para>
-	    Right click on the column header
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Click <guimenuitem>Add a Column</guimenuitem>
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    Click and drag a column you want into a space between
-	    existing column headers.  A red arrow will show you where
-	    the column will be placed.
-	  </para>
-	</listitem>
-      </orderedlist>
-      </para>
-      <para>
-	Right-click on one of the column headers to get a list of
-	options:
-	<variablelist>	  
-	<varlistentry>
-	  <term><guimenuitem>Sort Ascending</guimenuitem>:</term>
-	  <listitem><para>
-	      Sorts the messages top to bottom.
-	    </para></listitem>
-	</varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Sort Descending</guimenuitem>:</term>
-	    <listitem><para>
-		Sorts the messages bottom to top.
-	      </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Group By this Field</guimenuitem>:</term>
-	    <listitem><para>
-	      Groups messages instead of sorting them. This makes each contact
-	      with identical properties in the specified field to be placed in
-	      its own group and physically separated from others. 
-	    </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Remove this
-		Column</guimenuitem>:</term> <listitem><para> Remove
-		this column from the display. You can also remove
-		columns by dragging the header off the list and
-		letting it drop.  </para></listitem>
-	  </varlistentry>
-	  
-	  <varlistentry>
-	    <term><guimenuitem>Field
-		Chooser</guimenuitem>:</term> <listitem><para> 
-	      When you choose this item, a list
-	      of column headers will appear; just drag and drop them into
-	      place between two existing headers. A red arrow will
-	      appear to show you where you're about to put the
-	      column.  
-          </para></listitem>
-	</varlistentry>
-	</variablelist>
-      </para>
-    </sect1>
-
-    <sect1 id="usage-mail-organize-folders">
-      <title>Getting Organized with Folders</title>
-      <para>
-	<application>Ximian Evolution</application> keeps mail, as well as
-	address cards and calendars, in folders.  You start out with a
-	few, like <guilabel>Inbox</guilabel>,
-	<guilabel>Outbox</guilabel>, and <guilabel>Drafts</guilabel>,
-	but you can create as many as you like.  Create new folders by
-	selecting <guisubmenu>New</guisubmenu> and then
-	<guimenuitem>Folder</guimenuitem> from the
-	<guimenu>File</guimenu> menu.
-	<application>Ximian Evolution</application> will as you for the name
-	and the type of the folder, and will provide you with a folder
-	tree so you can pick where it goes.
-      </para>
-      <para>
-        When you click <guibutton>OK</guibutton>, your new folder will
-	appear in the <interface>folder view</interface>.  You can
-	then put messages in it by dragging and dropping them, or by
-	using the <guibutton>Move</guibutton> button in the
-	toolbar. If you want to move several messages at once, click
-	on the ones you want to move while holding down the
-	<keycap>Ctrl</keycap> key, or use <keycap>Shift</keycap> to
-	select a range of messages.  If you create a filter with the
-	<interface>filter assistant</interface>, you can have mail
-	filed automatically.
-      </para>
-  </sect1>    
-
-  <sect1 id="usage-mail-organize-search">
-      <title>Searching for Messages</title>
-      <para>
-	Most mail clients can search through your messages for you,
-	but <application>Ximian Evolution</application> does it faster. You
-	can search through just the message subjects, just the message
-	body, or both body and subject.
-      </para>
-      <para>
-	To start searching, enter a word or phrase in the text area
-	right below the toolbar, and choose a search type:
-	<variablelist>
-	  <varlistentry>
-	    <term><guilabel>Body or subject contains</guilabel>:</term>
-	  <listitem>
-	      <para>
-	        This will search message subjects and the messages
-	        themselves for the word or phrase you've entered in
-	        the search field.
-   	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term> <guilabel>Body contains</guilabel>:</term>
-	    <listitem>
-	      <para>
-	        This will search only in message text, not the subject
-	        lines.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Subject contains:</guilabel></term>
-	    <listitem>
-	      <para>
-	        This will show you messages where the search text is
-	        in the subject line.  It will not search in the
-	        message body.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Body does not contain:</guilabel></term>
-	    <listitem>
-	      <para>
-	        This finds every email message that does not have the
-	        search text in the message body.  It will still show
-	        messages that have the search text in the subject
-	        line, if it is not also in the body.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Subject does not contain:</guilabel></term>
-	    <listitem>
-	      <para>
-	        This finds every mail whose subject does not contain
-	        the search text.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-
-        When you've entered your search phrase, press
-        <keycap>Enter</keycap>.  <application>Ximian Evolution</application>
-        will show your search results in the message list.
-      </para>
-
-      <para>
-         If you think you'll want to return to a search again, you can
-         save it as a virtual folder by selecting <guilabel>Store
-         Search as vFolder</guilabel>.
-      </para>
-
-      <para>
-         When you're done with the search, go back to seeing all your
-         messages by choosing <guimenuitem>Show All</guimenuitem> from
-         the <guilabel>Search</guilabel> drop-down box. If you're
-         sneaky, just enter a blank search: since every message has at
-         least one space in it, you'll see every message in the
-         folder.
-      </para>
-
-      <para>
-        If you'd like to perform a more complex search, open the
-        advanced search dialog by selecting
-        <guilabel>Advanced...</guilabel> from the
-        <guilabel>Search</guilabel> drop-down menu.  Then, create your
-        search criteria (each with the same options you saw in the
-        regular search bar), and decide whether you want to find
-        messages that match all of them, or messages that match even
-        one. Then, click <guibutton>Search</guibutton> to go and find
-        those messages.
-     </para>
-
-     <para>
-        You'll see a similar approach to sorting messages when you
-        create filters and vFolders in the next few sections.
-     </para>
-
-    </sect1>
-
-    <sect1 id="usage-mail-organize-filters">
-      <title>Create Rules to Automatically Organize Mail</title>
-      <para>
-	Filters work very much like the mail room in a large company.
-	Their purpose is to bundle, sort, and distribute mail to the
-	various folders.  In addition, you can have multiple filters
-	performing multiple actions that may effect the same message
-	in several ways.  For example, your filters could put copies
-	of one message into multiple folders, or keep a copy and send
-	one to another person as well, and it can do that quickly. Of
-	course, it's also faster and more flexible than an actual
-	person with a pile of envelopes.
-      </para>
-
-    <sect2 id="usage-mail-org-filters-new">
-      <title>Making New Filters</title>
-      <para>
-	To create a new filter:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Click 
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Filters</guimenuitem>
-	      </menuchoice>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press the <guibutton>Add</guibutton> button.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Name your filter in the <guilabel>Rule name</guilabel> field.
-	      For each filter criterion, you must first select 
-	      which of the following parts of the message you want the filter to 
-	      examine:
-	      
-	      <itemizedlist>
-		<listitem><para>
-		    Sender - The sender's address.
-		  </para></listitem>
-		
-		
-		<listitem><para>
-		    Recipients - The recipients of the message.
-		  </para></listitem>
-	  
-		<listitem><para>
-		    Subject - The subject line of the message.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Specific Header - The filter can look at any header you
-		    want, even obscure or custom ones. Enter the header name
-		    in the first text box, and put your search text in the
-		    second one.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Message Body - Search in the actual text of the message.
-		  </para></listitem>
-		
-		<listitem>
-		  <para>
-		    Expression - For programmers only: match a message according to an
-		    expression you write in the Scheme language, used to
-		    define filters in <application>Ximian Evolution</application>.
-		  </para>
-		</listitem>
-		
-		<listitem><para> Date sent - Filter messages according to the date on
-		    which they were sent: First, choose the conditions you
-		    want a message to meet &mdash; <guilabel>before</guilabel>
-		    a given time, <guilabel>after</guilabel> it, and so forth.
-		    Then, choose the time. The filter will compare the
-		    message's time-stamp to the system clock when the filter
-		    is run, or to a specific time and date you choose from a
-		    calendar.  You can even have it look for messages within a
-		    range of time relative to the filter &mdash; perhaps you're
-		    looking for messages less than two days old.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Date Recieved - This works the same way as the <guilabel>Date Sent</guilabel> 
-		    option, except that it compares the time you got the message 
-		    with the dates you specify.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Score - Emails have a standard priority range from -3 (least
-		    important) to 3 (most important). You can have filters set the
-		    priority of messages you recieve, and then have other filters 
-		    applied only to those messages which have a certain priority.
-		  </para></listitem>
-		
-		<listitem>
-		  <para>
-		    Size (kb) - Sorts based on the size of the message in kilobytes.
-		  </para>
-		</listitem>
-
-		<listitem>
-		  <para>
-		    Status - Filters according to the status of a message, such as
-		    'New'.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Attachments - Create a filter based on whether or not you 
-		    have an attachment in the email.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Mailing List - Filter based on the mailing list it came from.
-		  </para>
-		  <note>
-		    <title>How Does Filtering on Mailing Lists Work?</title>
-		    <para>
-		      Filtering on mailing list actually looks for a
-		      specific mailing-list header called the
-		      <computeroutput>X-BeenThere</computeroutput>
-		      header, used to identify mailing lists or other
-		      redistributors of mail.
-		    </para>
-		  </note>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Regex Match - If you know your way around a
-		    <glossterm
-		    linkend="regular-expression">regex</glossterm>, or
-		    regular expression, put your knowledge to use
-		    here.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Source Account - Filter messages according the server you got them from.
-		    You can enter a URL or choose one from the drop-down
-		    list.  This ability is only relevant if you use more
-		    than one mail source.
-		  </para>
-		</listitem>
-	      </itemizedlist>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the criterion for the condition.   If you want multiple
-	      criteria for this filter, press <guibutton>Add
-		criterion</guibutton> and repeat the previous step.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the actions for the filter in the <guilabel>Then</guilabel>
-	      section.  You can select any of the following options.
-	      <itemizedlist>
-		<listitem><para>
-		    Move to Folder - If you select this item, <application>Ximian Evolution</application>
-		    will put the messages into a folder you specify.  Click the 
-		    <guibutton>&lt;click here to select a folder&gt;</guibutton> button
-		    to select a folder. 
-		  </para></listitem>
-
-		<listitem><para>
-		    Copy to Folder - If you select this item, <application>Ximian Evolution</application>
-		    will put the messages into a folder you specify.  Click the 
-		    <guibutton>&lt;click here to select a folder&gt;</guibutton> button
-		    to select a folder. 
-		  </para></listitem>
-		
-		<listitem><para>
-		    Forward to Address - Select this, enter an address, and the addressee will
-		    get a copy of the message.
-		  </para></listitem>
-
-		<listitem><para>
-		    Delete - Marks the message for deletion.  You can still get the message
-		    back, at least until you <guimenuitem>Expunge</guimenuitem> your
-		    mail yourself.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Stop Processing - Select this if you want to tell all other filters to ignore 
-		    this message, because whatever you've done with it so far
-		    is plenty.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Assign Color - Select this item, and <application>Ximian Evolution</application>
-		    will mark the message with whatever color you please.
-		  </para></listitem>
-		
-		<listitem><para> 
-		    Assign Score - If you know that all mail with
-		    "important" somewhere in the message body line is
-		    important, you can give it a high priority score. In a subsequent filter you can 
-		    then arrange your messages by their priority score.
-		  </para></listitem>
-	      </itemizedlist>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Set Status - If you want to add multiple actions for this filter, press
-	      <guibutton>Add filter</guibutton> and repeat the previous step.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press <guibutton>OK</guibutton>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <example id="filter-example">
-         <title>Using a Filter to Avoid Spam</title>
-         <para>
-           A good deal of bulk mail is eventually tagged with the
-           <computeroutput>Precedence: Bulk</computeroutput> header at
-           one point or another.  Not all of it is, of course, and
-           there are "good" messages (mailing lists you subscribe to,
-           for example) that are also considered "Bulk" mail.
-           However, if you filter out all the mail with that header,
-           you'll catch a lot of the mail you don't want to get.
-         </para>
-         <para>
-           To catch them and automatically mark them for deletion, do
-           the following:
-            <orderedlist>
-
-             <listitem><para>
-                 Select <menuchoice><guimenu>Tools</guimenu><guimenuitem>Filters</guimenuitem></menuchoice>.
-             </para></listitem>
-
-             <listitem><para>
-                 Click <guibutton>New</guibutton>.
-             </para></listitem>
-
-             <listitem><para>
-               Set the first part of your search critera to look in a <guilabel>Specific header</guilabel>.
-             </para></listitem>
-
-             <listitem><para>
-               Enter <userinput>Precedence</userinput> as the name of the header.
-             </para></listitem>
-
-             <listitem><para>
-               Choose <guilabel>contains</guilabel> at the second drop-down box.
-             </para></listitem>
-
-             <listitem><para>
-               Enter <userinput>Bulk</userinput> as the content to search for. 
-               You're now working with all email that has the word "Bulk" in the 
-               "Precedence" header.
-             </para></listitem>
-
-             <listitem><para>
-               For actions, select "Move to Folder" and choose the
-               folder where you'd like to place bulk mail.
-             </para></listitem>
-
-             <listitem><para> If you like, add another action and
-               choose <guilabel>Delete</guilabel>.
-               </para></listitem>
-
-             <listitem><para>
-                Click OK. You're done.
-             </para></listitem>
-	   </orderedlist>
-         </para>
-      </example>
-    </sect2>
-
-
-    
-    <sect2 id="filters-edit">
-      <title>Editing Filters</title>
-      <para>
-	To edit a filter:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenuitem>Filters</guimenuitem>
-	      </menuchoice>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the filter in the <guilabel>Filter Rules</guilabel> section
-	      and press <guibutton>Edit</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Change the desired settings.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press <guibutton>OK</guibutton> in the filter editor window.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press <guibutton>OK</guibutton> in the filter manager window.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-    
-    <sect2 id="filters-deleting">
-      <title>Deleting Filters</title>
-      <para>
-	To delete a filter:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select
-	      <menuchoice>
-		<guimenu>Tools</guimenu>
-		<guimenu>Filters</guimenu>
-	    </menuchoice>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the filter and press <guibutton>Delete</guibutton>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	<note>
-	  <title>Changing Folder Names and Filters</title>
-	  <para>
-	    <itemizedlist>
-	      <listitem>
-		<para>
-		  Incoming email that your filters don't move goes into the Inbox; 
-		  outgoing mail that they don't move ends up in the Sent
-		  folder.  So be sure to change the filters that go with it.
-		</para>
-	      </listitem>
-	    </itemizedlist>
-	  </para>
-	</note>
-      </para>
-    </sect2>
-  </sect1>
-    
-    <sect1 id="usage-mail-organize-vfolders">
-      <title>Getting Really Organized with vFolders</title>
-      <para>
-	If filters aren't flexible enough for you, or you find
-	yourself performing the same search again and again, consider
-	a vFolder. vFolders, or virtual folders, are an advanced way
-	of viewing your email messages within
-	<application>Ximian Evolution</application>.  If you get a lot of
-	mail or often forget where you put messages, vFolders
-	can help you stay on top of things.
-      </para>
-      <para>
-	A vFolder is really a hybrid of all the other organizational
-	tools: it looks like a folder, it acts like a search, and you
-	set it up like a filter.  In other words, while a conventional
-	folder actually contains messages, a vFolder is a view of
-	messages that may be in several different folders.  The
-	messages it contains are determined on the fly using a set of
-	criteria you choose in advance.
-      </para>
-
-      <para>
-	As messages that meet the vFolder criteria arrive or are
-	deleted, <application>Ximian Evolution</application> will
-	automatically place them in and remove them from the
-	vFolder contents list.  When you delete a message, it gets
-	erased from the folder in which it actually exists, as well as
-	any vFolders which display it.
-      </para>
-
-      <para>
-	Imagine a business trying to keep track of mail from hundreds
-	of vendors and clients, or a university with overlapping and
-	changing groups of faculty, staff, administrators and
-	students.  The more mail you need to organize, the less you
-	can afford the sort of confusion that stems from an
-	organizational system that's not flexible enough.  vFolders
-	make for better organization because they can accept
-	overlapping groups in a way that regular folders and filing
-	systems can't.
-      </para>
-
-
-    <note id="unmatched-vfolder">
-      <title>The "Unmatched" vFolder</title>
-      <para>
-	Obviously, not all messages will fit into all your Virtual
-	Folders.  That's why <application>Ximian
-	Evolution</application> includes an Unmatched vFolder.  The
-	Unmatched vFolder displays messages that are not matched by
-	other rules. If you have no vFolders, the Unmatched folder
-	will contain all of your mail.
-      </para>
-    </note>
-
-
-    <example id="usage-mail-organize-vFolders-ex">
-      <title>Using Folders, Searches, and vFolders</title>
-      <para>
-	To organize his mailbox, Jim sets up a virtual volder for emails from
-	his friend and co-worker Anna.  He has another one for messages that
-	have ximian.com in the address and <application>Ximian Evolution</application> in the subject line, so he
-	can keep a record of what people from work send him about
-	<application>evolution</application>.  If Anna sends him a message about
-	anything other than <application>Ximian Evolution</application>, it only shows up in the "Anna" folder.
-	When Anna sends him mail about the user interface for
-	<application>evolution</application>, he can see that message both in
-	the "Anna" vFolder and in the "Internal Evolution Discussion"
-	vFolder.
-       </para>
-      </example>
-
-	<!--  (INSERT SCREENSHOT HERE: vFolders in action) -->
-
-    <sect2 id="vfolder-create">
-      <title>Creating vFolders</title>
-      <para>
-	To create a vFolder:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	    <menuchoice>
-	      <guimenu>Tools</guimenu>
-	      <guimenuitem>vFolder Editor</guimenuitem>
-	    </menuchoice>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>Add</guibutton>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Name your vFolder in the <guilabel>Rule name</guilabel> field.
-
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select your search criteria. For each criterion, you
-	      must first select which of the following parts of the
-	      message you want the search to examine:
-	      <itemizedlist>
-		<listitem><para>
-		    Sender - The sender's address.
-		  </para></listitem>
-		
-		
-		<listitem><para>
-		    Recipients - The recipients of the message.
-		  </para></listitem>
-	  
-		<listitem><para>
-		    Subject - The subject line of the message.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Specific Header - The vFolder can look at any header you
-		    want, even obscure or custom ones. Enter the header name
-		    in the first text box, and put your search text in the
-		    second one.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Message Body - Search in the actual text of the message.
-		  </para></listitem>
-		
-		<listitem>
-		  <para>
-		    Expression - For programmers only: match a message according to an
-		    expression you write in the Scheme language, used to
-		    define vFolders in <application>Ximian Evolution</application>.
-		  </para>
-		</listitem>
-		
-		<listitem><para> Date sent - Search messages according to the date on
-		    which they were sent: First, choose the conditions you
-		    want a message to meet &mdash; <guilabel>before</guilabel>
-		    a given time, <guilabel>after</guilabel> it, and so forth.
-		    Then, choose the time. The vFolder will compare the
-		    message's time-stamp to the system clock when the filter
-		    is run, or to a specific time and date you choose from a
-		    calendar.  You can even have it look for messages within a
-		    range of time relative to the filter &mdash; perhaps you're
-		    looking for messages less than two days old.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Date Recieved - This works the same way as the <guilabel>Date Sent</guilabel> 
-		    option, except that it compares the time you got the message 
-		    with the dates you specify.
-		  </para></listitem>
-		
-		<listitem><para>
-		    Score - Emails have a standard priority range from -3 (least
-		    important) to 3 (most important). You can have vFolders set the
-		    priority of messages you recieve, and then have other
-		    vFolders 
-		    applied only to those messages which have a certain priority.
-		  </para></listitem>
-		
-		<listitem>
-		  <para>
-		    Size (kb) - Sorts based on the size of the message in kilobytes.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Status - Searches according to the status of a message, such as
-		    'New'.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Attachments - Create a vFolder based on  whether or not you have an
-		    attachment in the email.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Mailing List - Search based on the mailing list it came from.
-		  </para>
-		</listitem>
-		
-		<listitem>
-		  <para>
-		    Source Account - Search messages according the server you got them from.
-		    You can enter a URL or choose one from the drop-down
-		    list.  This ability is only relevant if you use more
-		    than one mail source.
-		  </para>
-		</listitem>
-	      </itemizedlist>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the folder sources.  You can select:
-	      <itemizedlist>
-		<listitem>
-		  <para>
-		    Specific folders only
-		    <note>
-		      <para>
-			If you select specific folders only, you need to specify the
-			source folders in the box below.
-		      </para>
-		    </note>
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    All local folders
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    With all active remote folders
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    With all local and active folders
-		  </para>
-		</listitem>
-	      </itemizedlist>
-	
-         </para>
-     </listitem>
-   </orderedlist>
-</para>
-<para>
-Remote folders are considered active if you are connected to the
-server; you must be connected to your mail server for the vFolder to
-include any messages from that source.
-</para>
-<para>
-      <figure id="usage-mail-vfolder-fig-createrule">
-	<title>Selecting a vFolder Rule</title>
-	<screenshot>
-	  <screeninfo>Creating a vFolder Rule</screeninfo>
-	  <mediaobject><imageobject><imagedata
-	  fileref="figures/vfolder-createrule-fig" format="png"
-	  srccredit="Aaron Weber">
-	  </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-      </para>
-    </sect2>
-  </sect1>
-</chapter>
diff --git a/help/no/usage-mail.sgml b/help/no/usage-mail.sgml
deleted file mode 100644
index 2a1958805e..0000000000
--- a/help/no/usage-mail.sgml
+++ /dev/null
@@ -1,2005 +0,0 @@
-<chapter id="usage-mail">
-  <title>Using Evolution for Email</title>
-  <para>
-    This chapter, and <xref linkend="usage-mail-organize">, will
-      provide you with an in-depth guide to the capabilities of
-      Evolution as a mail client.  For information about how to set up
-      your mail account, see <xref linkend="config-prefs-mail">.
-  </para>
-  
-  <note>
-    <title>If you use IMAP Mail</title>
-    <para>
-      If you chose IMAP mail during the setup process, you must
-      subscribe to your mail folders before you can read mail in
-      them. Read <xref linkend="usage-mail-subscriptions"> to find out
-      how.
-    </para>
-  </note>
-  
-  
-  <sect1 id="usage-mail-getnsend-read">
-    <title>Reading Mail</title>    
-    <para>
-      Start the mail client by clicking on the
-      <guibutton>Inbox</guibutton> icon in the shortcut bar, or by
-      selecting a mail folder in the folder bar.  To read a message,
-      select it in the message list; if you'd like to see it in its
-      own window, double-click on it or press
-      <keycombo action="simul">
-	<keycap>Ctrl</keycap>
-	<keycap>O</keycap>
-      </keycombo>.
-    </para>
-
-      <tip id="spaceandbs">
-	<title>Reading Mail with the Keyboard</title>
-	<para>
-	  You can click the spacebar to page down while you're reading
-	  an email, and press backspace to page up in an email.  This
-	  may help to make reading your email faster.
-	</para>
-      </tip>
-
-    <sect2 id="usage-mail-listorder">
-      <title>Sorting the message list</title>
-      <para>
-	<application>Evolution</application> helps you work by letting you sort
-	your email.  To sort by sender, subject, or date, click
-	on the bars with those labels at the top of the message
-	list. The direction of the arrow next to the label indicates
-	the direction of the sort, and if you click again, you'll
-	sort them in reverse order. For example, click once on
-	<guilabel>Date</guilabel> to sort messages by date from
-	oldest to newest.  Click again, and
-	<application>Evolution</application> sorts the list from
-	newest to oldest. You can also right-click on the message
-	header bars to get a set of sorting options, and add or
-	remove columns from the message list.  You can find detailed
-	instructions on how to customize your message display
-	columns in <xref linkend="usage-mail-organize-columns">.
-      </para>
-
-      <tip id="view-headers">
-	<title>Email Headers</title>
-	<para>
-	  To look at the complete headers for email messages, select
-	  <menuchoice><guimenu>View</guimenu><guisubmenu>Message
-	  Display</guisubmenu><guimenuitem>Show Full
-	  Headers</guimenuitem></menuchoice>. To see absolutely every
-	  bit, choose
-	  <menuchoice><guimenu>View</guimenu><guisubmenu>Message
-	  Display</guisubmenu><guimenuitem>Show Email Source
-	  </guimenuitem></menuchoice>.
-       </para>
-      </tip>
-
-      <para>
-	You can also choose a threaded message view. Select
-	<menuchoice> 
-	  <guimenu>View</guimenu>
-          <guimenuitem>Threaded</guimenuitem> 
-	</menuchoice> 
-	to turn the threaded view on or off.  When you select this option,
-	<application>Evolution</application> groups the replies to a
-	message with the original, so you can follow the thread of a
-	conversation from one message to the next.
-      </para>
-<figure>
-        <title>Threaded Mail View</title>
-<screenshot>
-<screeninfo>Threaded Mail View</screeninfo>
-<mediaobject><imageobject><imagedata  format="png" fileref="figures/mail-threaded" srccredit="Aaron Weber">
-</imageobject></mediaobject>
-</screenshot>
-</figure>
-
-    </sect2>
-    
-    <sect2 id="usage-mail-getnsend-delete">
-        <title>Deleting Mail</title>
-        <para>
-          Once you've read your mail, you may want to get rid of
-          it. 
-	To delete a message:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Click the message to select it
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press delete button or right click on the message and
-	      choose <guilabel>Delete</guilabel>.
-	    </para>
-	    <note>
-	      <title>Why do I still see deleted mail?</title>
-	      <para>
-		When you press <guibutton>Delete</guibutton> or click
-		the trash button, your mail isn't actually deleted,
-		but is marked for deletion.  Your email is not gone
-		until you have expunged it. When you "Expunge" a
-		folder, you remove all the mail that you have marked
-		for deletion.
-	      </para>
-              <para>
-                 If you don't like this behavior, select
-                 <menuchoice><guimenu>View</guimenu><guimenuitem>Hide
-                 Deleted Messages</guimenuitem></menuchoice>. Then,
-                 you will only see deleted messages when you look in
-                 your <guilabel>Trash</guilabel> folder.
-              </para>
-	    </note>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click
-	      <menuchoice>
-		<guimenu>Actions</guimenu>
-		<guimenuitem>Expunge</guimenuitem>
-	      </menuchoice>
-	      or press
-	      <keycombo action="simul">
-		<keycap>Ctrl</keycap>
-		<keycap>E</keycap>
-	      </keycombo>
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <note>
-	<title>Trash is Actually a vFolder?</title>
-	<para>
-	  Your trash folder is actually a vFolder that displays all
-          messages you have marked for later deletion.  For more
-          information about vFolders, see <xref
-          linkend="usage-mail-organize-vfolders">.  If you choose
-          <menuchoice> <guimenu>Actions</guimenu> <guimenuitem>Empty
-          Trash</guimenuitem> </menuchoice> you will expunge
-          <emphasis>all</emphasis> your folders.
-	</para>
-      </note>
-    </sect2>
-    <sect2 id="usage-mail-getnsend-undelete">
-      <title>Undeleting Messages</title>
-      <para>
-	To undelete a message:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select a message you have marked for deletion.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press <keycombo
-	      action="simul"><keycap>Ctrl</keycap><keycap>U</keycap>
-	      </keycombo>
-	      or choose
-	      <menuchoice>
-		<guimenu>Actions</guimenu>
-		<guimenuitem>Undelete</guimenuitem>
-	      </menuchoice>
-
-	    </para>
-	    <note>
-	      <title>What does Undelete actually do?</title>
-	      <para>
-                If you have marked a message for deletion, undeleting
-		it will unmark it, and the message will be removed
-		from the Trash folder. However, it can't bring back
-		messages that have been expunged.
-	      </para>
-	    </note>
-	  </listitem>
-	</orderedlist>
-      </para>
-    </sect2>
-  </sect1>
-
-  <sect1 id="usage-mail-getnsend-get">
-    <title>Checking for New Mail</title>
-    <para>
-      Now that you've had a look around the
-      <interface>Inbox</interface>, it's time to check for new mail.
-      Click <guibutton>Get Mail</guibutton> in the toolbar to check
-      your mail.  If you haven't entered any mail settings yet, the
-      <interface>setup assistant</interface> will ask you for the
-      information it needs to check your email.
-    </para>
-    <para>
-      The assistant will give you several dialog boxes where you configure:
-      <itemizedlist>
-	<listitem>
-	  <para>
-	    your personal information
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    your outgoing email server information
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    your mail account identity name
-	  </para>
-	</listitem>
-      </itemizedlist>
-    </para>
-    <para>
-      To check your email, press the <guibutton>Check Mail</guibutton>
-      button.  If this is your first time checking mail, or you
-      haven't asked <application>Evolution</application> to store your
-      password, you'll be prompted for the password.  Enter your
-      password and your email will be downloaded.
-    </para>
-    <note id="badmailsettings">
-      <title>Can't Check Mail?</title>
-      <para>
-	If you get an error message instead of mail, you probably need
-	to check your network settings.  To learn how to do that, have
-	a look at <xref linkend="config-prefs-mail">, or ask your
-	system administrator.
-       </para>
-     </note>
-
-
-
-          <tip>
-            <title>Sharing Mailboxes with Other Mail Programs</title>
-            <para>
-              If you want to use <application>Evolution</application>
-              and another email client, such as
-              <application>Mutt</application>, at the same time,
-              here's how:
-              <orderedlist numeration="arabic">
-                <listitem>
-                   <para>
-                      Download your mail in the other application as
-                      you would normally.
-                   </para>
-                  </listitem>
-                <listitem>
-                   <para>
-                      In <application>Evolution</application>
-                      <menuchoice><guimenu>Tools</guimenu><guimenuitem>Mail
-                      Settings</guimenuitem></menuchoice>, and pick the account
-                      you'd like to use to share mail. You may want to
-                      create a new account just for this source of
-                      mail.
-                   </para>
-               </listitem>                     
-               <listitem>
-                   <para>
-                      Under the <guilabel>Receiving Mail</guilabel>
-                      tab, select the type of mail file that your
-                      other mail application uses, and then enter the
-                      full path to that file.
-                   </para>
-                  </listitem>
-                <listitem>
-                   <para>
-                      Click the <guibutton>OK</guibutton> button.
-                   </para>
-                  </listitem>
-                </orderedlist>
-               </para>
-            </tip>
-
-
-<!-- NOT FOR 1.0
-       <sect2 id="usage-mail-getnsend-get-news">
-	  <title>Using Evolution for News</title>
-	<para>
-	  Newsgroups are so similar to email that there's no reason not
-	  to read them side by side.  If you want to do that, add a
-	  news source to your configuration (see <xref
-	  linkend="config-prefs-network-news">). The news server will
-	  appear as a remote server, and will look quite similar to an
-	  IMAP folder.  When you click <guibutton>Get Mail</guibutton>,
-	  <application>Evolution</application> will also check for news
-	  messages.
-	</para>
-	</sect2>
--->
-
-     <sect2 id="usage-mail-getnsend-get-attach">
-	 <title>Working with Attachments and HTML Mail</title>
-	 <para>
-	   If someone sends you an <glossterm linkend="attachment">attachment</glossterm>,
-	   a file attached to an email,
-	   <application>Evolution</application> will display the file
-	   at the bottom of the message to which it's attached.  Text,
-	   including HTML formatting and embedded images, will appear
-	   as part of the message, rather than at the end of the
-	   message as an attachment.
-     </para>
-
-     <sect3 id="usage-mail-getnsend-get-attach-actions">
-     <title>Saving or Opening Attachments</title>
-     <para>
-        If you get an attachment with an email message,
-        <application>Ximian Evolution</application> can help you save
-        it or open it with the appropriate applications.
-     </para>
-     <para>
-       To save an attachment to disk:
-       <orderedlist numeration="arabic">
-	 <listitem>
-	   <para>
-	     Click the downward pointing arrow on the attachment icon
-	     and select <guimenuitem>Save to Disk</guimenuitem>.
-	   </para>
-	 </listitem>
-	 <listitem>
-	   <para>
-	     Choose a location and name for the file.
-	   </para>
-	 </listitem>
-	 <listitem>
-	   <para>
-	     Click <guibutton>OK</guibutton>.
-	   </para>
-	 </listitem>
-       </orderedlist>
-      </para>
-
-      <para>
-	To Open an Attachment in a Program:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Open the mail message with the attachment you want to read.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click the arrow next the attachment icon.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the program you'd like to use. It will start up
-	      and open the document.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-      </para>
-      </sect3>
-
-      <sect3 id="usage-mail-getnsend-get-attach-html">
-      <title>Inline Images in HTML Mail</title>
-      <para>
-         When someone sends you HTML mail that includes an image in
-         the body of the message (for example, the welcome message in your
-         Inbox when you first start <application>Ximian
-         Evolution</application>) <application>Evolution</application>
-         will display the image inside the message.  You can create
-         messages like this by using the
-         <menuchoice><guimenu>Insert</guimenu><guimenuitem>Image</guimenuitem></menuchoice>
-         tool in the message composer.
-      </para>
-
-      <para>
-         If the image isn't included in the message, but is, instead,
-         a link to an image, <application>Evolution</application> can
-         download the image from the Internet for you.  However,
-         <application>Evolution</application> will not display the
-         image unless you ask it to. This is because remotely hosted
-         images can be slow to load and display, and can even be used
-         by spammers to track who reads their email.  Having images
-         not load automatically helps protect your privacy.
-      </para>
-      <para>
-	 If you want the images to load for one message, select 
-	 <menuchoice>
-	   <guimenu>View</guimenu>
-	   <guisubmenu>Message Display</guisubmenu>
-	   <guimenuitem>Load Images</guimenuitem>
-         </menuchoice>.  
-
-         If you want <application>Ximian Evolution</application> to
-         load remotely hosted images more often, go to the
-         <guilabel>Display</guilabel> tab of the
-         <menuchoice>
-	   <guimenu>Tools</guimenu>
-	   <guimenuitem>Mail Settings</guimenuitem>
-         </menuchoice> dialog.
-      </para>
-      <note id="http-proxy">
-	<title>Loading Images from the Net through an HTTP Proxy</title>
-        <para>
-           If you use an HTTP proxy,
-           <application>Evolution</application> must be able to find
-           it through the <systemitem>gnome-vfs</systemitem> subsystem
-           before it can load images from the Internet.  This is also
-           the case if you wish to access weather and news information
-           through the Summary tool. You can tell the GNOME Virtual
-           File System about your HTTP proxy in one of two ways:
-            <variablelist>
-	    <varlistentry>
-	      <term>Configure it with Nautilus</term>
-	      <listitem>
-		<para>
-                 <orderedlist numeration="arabic">
-		    <listitem>
-		      <para>
-			Open a Nautilus window
-	               </para>
-		    </listitem>
-      		    <listitem>
-		      <para>
-	                 Select <menuchoice>
-			  <guimenu>Preferences</guimenu>
-			  <guimenuitem>Edit Preferences</guimenuitem>
-			</menuchoice>.
-	               </para>
-		    </listitem>
-      		    <listitem>
-		      <para>
-			Go to the <guilabel>Navigation</guilabel> tab.
-	               </para>
-		    </listitem>
-      		    <listitem>
-		      <para>
-			Click the <guilabel>Use HTTP Proxy</guilabel>
-			checkbox and enter the location of your HTTP
-			proxy in the <guilabel>Location</guilabel> field.
-	               </para>
-		    </listitem>
-		  </orderedlist>
-                </para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>Configure it with the gconftool command</term>
-	      <listitem>
-	      <para>
-                 <orderedlist numeration="arabic">
-		    <listitem>
-		      <para>
-                        Open a terminal.
-                      </para>
-		    </listitem>
-		    <listitem>
-		      <para>
-                        Enter the command 
-                        <command>
-                        gconftool --type=bool --set /system/gnome-vfs/use-http-proxy "TRUE"
-                        </command>
-                      </para>
-		    </listitem>
-		    <listitem>
-		      <para>
-                        Enter the command 
-                        <command>
-      gconftool --type=string --set /system/gnome-vfs/http-proxy-host "your-proxy-url"
-                        </command>
-                      </para>
-		    </listitem>
-		    <listitem>
-		      <para>
-                        Enter the command 
-                        <command>
-                        gconftool --type=int --set /system/gnome-vfs/http-proxy-port "8080"
-                        </command>                  
-                      </para>
-		    </listitem>
-		  </orderedlist>
-                </para>
-		<para>
-                  For more information about the gconftool command,
-                  read the gconftool man page.
-                </para>
-	      </listitem>
-	    </varlistentry>
-	  </variablelist>
-         </para>
-      </note>
-     </sect3>
-    </sect2>
-  </sect1>
-
-    <sect1 id="usage-mail-getnsend-send">
-      <title>Composing New Email Messages</title>
-      <para>
-         You can start writing a new email message by selecting
-         <menuchoice> <guimenu>File</guimenu>
-         <guisubmenu>New</guisubmenu> <guimenuitem>
-         Mail Message</guimenuitem></menuchoice>, or by pressing the
-         <guibutton>Compose</guibutton> button in the Inbox toolbar.
-         When you do so, the <interface>New Message</interface> window
-         will open, as shown in <xref
-         linkend="usage-mail-newmsg-fig">.
-      </para>
-
-<!--   ==============Figure=================================== -->
-      <figure id="usage-mail-newmsg-fig">
-        <title>New Message Window</title>
-        <screenshot>
-          <screeninfo>Evolution Main Window</screeninfo>
-          <mediaobject><imageobject><imagedata fileref="figures/newmsg" format="png" srccredit="Aaron Weber">
-        </imageobject></mediaobject>
-        </screenshot>
-      </figure>
-<!-- ==============End of Figure=================================== -->
-
-      <para>
-      Enter an address in the <guilabel>To:</guilabel> field.  If you
-      wish, enter a subject in the <guilabel>Subject:</guilabel>, and
-      a message in the box at the bottom of the window.
-      Once you have written your message, press
-      <guibutton>Send</guibutton>.
-    </para>
-
-      <sect2 id="usage-mail-getnsend-send-delay">
-        <title>Sending Composed Messages Later</title>
-        <para>
-           <application>Evolution</application> will send mail
-           immediately unless you tell it to do otherwise by selecting
-           <menuchoice> <guimenu>File</guimenu> <guimenuitem>Send
-           Later</guimenuitem></menuchoice>.  This will add your
-           messages to the <guilabel>Outbox</guilabel> queue.  The
-           "Send Later" feature is particularly useful if you use a
-           modem to connect to the Internet and pay per-minute
-           charges: you can remain offline until you need to send
-           mail, then connect and send all your mail at once.  Mail in
-           the outbox is sent when you click
-           <guibutton>Send/Recieve</guibutton> in the main window.
-        </para>
-        <para>
-           To learn more about how you can specify message queue and
-           filter behavior, see <xref linkend="config-prefs-mail">.
-        </para>
-	  <note>
-            <title>Working Offline</title>
-            <para>
-	      Select
-	      <menuchoice><guimenu>File</guimenu><guimenuitem>Work
-	      Offline</guimenuitem></menuchoice> to have
-	      <application>Ximian Evolution</application> disconnect
-	      from the Internet while you work. When you want to
-	      reconnect, choose
-	      <menuchoice><guimenu>File</guimenu><guimenuitem>Work
-	      Online</guimenuitem></menuchoice>.  Alternativly, you can click the connection button at the bottom left side of the window.
-            </para>
-         </note>
-
-      <para>
-	You can also choose to save messages as drafts or as text
-	files. Your options are:
-       <itemizedlist>
-        <listitem><para>
-          Choose
-	  <menuchoice>
-	   <guimenu>File</guimenu>
-	    <guimenuitem>Save Draft</guimenuitem>
-          </menuchoice>
-          to store your messages in the drafts folder for later
-          revision.
-       </para></listitem>
-
-       <listitem><para>
-         If you'd like to have the message sent later, you
-         can choose <guimenuitem>Send Later</guimenuitem>. That way,
-         the message will be added to the queue, and you can send a 
-         batch of messages all at once.
-        </para></listitem>
-        
-        <listitem><para> 
-         If you prefer to save your message as a text file,
-         choose <guimenuitem>Save As</guimenuitem> and then choose a
-         file name.
-           </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-    </sect2>
-
-    <sect2 id="usage-mail-getnsend-send-compose">
-      <title>More About Mail Composition</title>
-      <para>
-        In the next few sections, you'll see how
-	<application>Evolution</application> handles advanced email
-	features, including large recipient lists, attachments, and
-	forwarding.
-      </para>
-      <sect3 id="usage-mail-getnsend-send-attach">
-        <title>Attachments</title>
-        <para>
-	  To attach a file to your email:
-	  <orderedlist numeration="arabic">
-	    <listitem>
-	      <para>
-		Push the attach button in the composer toolbar
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Select the file you want to attach
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Press <guibutton>OK</guibutton>
-	      </para>
-	    </listitem>
-	  </orderedlist>
-	</para>
-	<para>
-	  You can drag a file from your desktop into the composer window to
-	  attach it as well.
-        </para>
-        <para>
-            To hide the display of files you've attached to the
-            message, select <menuchoice>
-            <guimenu>View</guimenu> <guimenuitem>Hide
-            Attachments</guimenuitem> </menuchoice>; to show them
-            again, choose <guimenuitem>Show Attachments</guimenuitem>.
-        </para>
-        <para>
-            When you send the message, a copy of the attached file
-            will go with it.  Be aware that big attachments can take a
-            long time to download.
-        </para>
-       </sect3>
-
-      <sect3 id="usage-mail-getnsend-send-to-types">
-	<title>Specifying Recipients for Email</title>
-        <para>
-	  <application>Evolution</application>, like most email
-	   programs, recognizes three types of addressee: primary
-	   recipients, secondary recipients, and hidden ("blind")
-	   recipients.
-         </para>
-         <para>
-            The simplest way to direct a message is to put the email
-            address or addresses in the <guilabel>To:</guilabel>
-            field, which denotes primary recipients.  To send mail to
-            more than one or two people, you can use the
-            <guilabel>Cc:</guilabel> field.
-          </para>
-          <para>
-            Hearkening back to the dark ages when people used
-            typewriters and there were no copy machines, "Cc" stands
-            for "Carbon Copy."  Use it whenever you want to share a
-            message you've written to someone else.
-          </para>
-          <para>
-            <guilabel>Bcc:</guilabel> is a little more complex.  You
-            use it like <guilabel>Cc:</guilabel>, but people on the
-            <guilabel>Bcc:</guilabel> list are hidden from the other
-            recipients of the message. Use it to send mail to large
-            groups of people, especially if they don't know each other
-            or if privacy is a concern.  If your <guilabel>Bcc:</guilabel> field is absent, click
-	    <menuchoice>
-	      <guimenu>View</guimenu>
-	      <guimenuitem>Bcc Field</guimenuitem>
-	    </menuchoice>.
-		
-          </para>
-
-         <para>
-           If you frequently write email to the same groups of people,
-           you can create address lists in the Contact Manager, and
-           then send them mail as though they had a single address.
-           To learn how to do that, read <xref
-           linkend="usage-contact-organize-group-list">.
-        </para>
-
-        </sect3>
-
-        <sect3 id="usage-mail-getnsend-send-to">
-        <title>Choosing Recipients Quickly</title>
-        <para>
-	  If you have created address cards in the contact manager,
-          you can also enter nicknames or other portions of address
-          data, and <application>Evolution</application> will offer a
-          drop down list of possible address completions from your
-          address book.  If you enter a name or nickname that can go
-          with more than one card, Evolution will open a dialog box to
-          ask you which person you meant. 
-
-<!-- Also, <application>Evolution</application> will add a
-          domain to any unqualified addresses.  By default, this is
-          your domain, but you can choose which one mail preferences
-          dialog. NOTE: Bug filed on this: it's not available now,
-          but may be in the future. 
--->
-
-          </para>
-
-          <para>
-            Alternately, you can click on the
-            <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
-            <guibutton>Bcc:</guibutton> buttons to get a list --
-            potentially a very long one -- of the email addresses
-            in your contact manager.  Select addresses and click on
-            the arrows to move them into the appropriate address
-            columns.
-          </para>
-          <para>
-            For more information about using email together with the
-            contact manager and the calendar, see <xref
-            linkend="contact-automation-basic"> and <xref
-            linkend="usage-calendar-apts">.
-          </para>
-        </sect3>
-      </sect2>
-
-      <sect2 id="usage-mail-getnsend-send-reply">
-        <title>Replying to Email Messages</title>
-        <para>
-           To reply to a message, press the
-           <guibutton>Reply:</guibutton> button while it is selected,
-           or choose <guimenuitem>Reply to Sender:</guimenuitem> from
-           the message's right-click menu.  That will open the
-           <interface>message composer</interface>.  The
-           <guilabel>To:</guilabel> and <guilabel>Subject:</guilabel>
-           fields will already be filled, although you can alter them
-           if you wish.  In addition, the full text of the old message
-           is inserted into the new message, either grey (for
-           HTML display) or with the &gt; character before each line
-           (in plain text mode), to indicate that it's part of the
-           previous message.  People often intersperse their message
-           with the quoted material as shown in <xref
-           linkend="usage-mail-getnsend-reply-fig">.
-
- <!-- ==============Figure=================================== -->
-       <figure id="usage-mail-getnsend-reply-fig">
-         <title>Reply Message Window</title>
-         <screenshot>
-          <screeninfo>Evolution Main Window</screeninfo>
-          <mediaobject><imageobject><imagedata fileref="figures/replymsg" format="png" srccredit="Aaron Weber">
-        </imageobject></mediaobject>
-        </screenshot>
-      </figure>
-<!-- ==============End of Figure=================================== -->
-        </para>
-        <para>
-          If you're reading a message with several recipients, you may
-           wish to use <guibutton>Reply to All</guibutton> instead of
-           <guibutton>Reply</guibutton>.  If there are large numbers
-           of people in the <guilabel>Cc:</guilabel> or
-           <guilabel>To:</guilabel> fields, this can save substantial
-           amounts of time.
-          <example>
-            <title>Using the Reply to All feature</title>
-            <para>
-              Susan sends an email to a client and sends copies to Tim
-              and to an internal company mailing list of co-workers.
-              If Tim wants to make a comment for all of them to read,
-              he uses <guibutton>Reply to All</guibutton>, but if he
-              just wants to tell Susan that he agrees with her, he
-              uses <guibutton>Reply</guibutton>.  Note that his reply
-              will not reach anyone that Susan put on her
-              <guilabel>Bcc</guilabel> list, since that list is not
-              shared with anyone.
-            </para>
-          </example>
-        </para>
-        <para>
-          If you're subscribed to a mailing list, and want your reply
-          to go just to the list, rather than to the sender, choose
-          <guibutton>Reply to List</guibutton> instead of
-          <guibutton>Reply</guibutton> or <guibutton>Reply to
-          All</guibutton>.
-          <note>
-            <title>What is a Mailing List?</title>
-            <para>
-              Mailing Lists are one of the most popular tools for
-              group collaboration on the Internet. Here's how they work: 
-              <simplelist>
-                <member>
-                  Someone sends a message to a single address, like
-                  <email>evolution@ximian.com</email>.
-                </member>
-                <member>
-                  That address belongs to a program that distributes
-                  the message to a list of recipients.
-                </member>
-             </simplelist>
-               The mail management program lets individuals subscribe
-               to or unsubscribe from the list at will, without
-               requiring the message writers to remember the addresses
-               of every recipient.
-            </para>
-            <para>
-              Mailing list servers can also let network administrators
-              control mail flow, list membership, and even moderate
-              the content of mailing lists.
-            </para>
-          </note>
-        </para>
-      </sect2>
-
-      <sect2 id="usage-mail-getnsend-send-find">
-        <title>Searching and Replacing with the Composer</title>
-        <para>
-           You are probably familiar with search and replace features
-           in any sort of text-editing software, and if you come from
-           a Linux or Unix background, you may know what
-           <guimenuitem>Find Regex</guimenuitem> does.  If you aren't
-           among the lucky who already know, here's a quick rundown of
-           the automated text searching features that the message
-           composer makes available to you.
-        </para>
-        <para>
-           <variablelist>
-            <varlistentry>
-              <term><guimenuitem>Find:</guimenuitem></term>
-              <listitem><para> Enter a word or phrase, and
-              <application>Evolution</application> will find it
-              in your message.
-              </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term><guimenuitem>Find Regex:</guimenuitem></term>
-              <listitem>
-                <para>
-                  Find a regex, also called a
-                  <glossterm linkend="regular-expression">regular
-                  expression</glossterm>, in your composer window.
-               </para>
-             </listitem>
-            </varlistentry>
-
-            <varlistentry>
-              <term><guimenuitem>Find Again:</guimenuitem></term>
-              <listitem><para>
-                   Select this item to repeat the last search you performed.
-              </para></listitem>
-            </varlistentry>
-
-            <varlistentry>
-               <term><guimenuitem>Replace:</guimenuitem></term>
-               <listitem><para>
-                 Find a word or phrase, and replace it with
-                 something else.
-               </para></listitem>
-            </varlistentry>
-
-          </variablelist>
-        </para>
-
-        <para>
-            For all of these menu items, you can choose whether or not
-            to <guilabel>Search Backwards</guilabel> in the document
-            from the point where your cursor is.  For all but the
-            regular expression search (which doesn't need it), you are
-            offered a check box to determine whether the search is to
-            be <guilabel>Case Sensitive</guilabel> when it determines
-            a match.
-        </para>
-      </sect2>
-
-      <sect2 id="usage-mail-getnsend-send-html">
-        <title>Enhance your email with HTML</title>
-        <para>
-            Normally, you can't set text styles or insert pictures in
-            emails, which is why email is often regarded as
-            uncommunicative and cold, and why people often resort to
-            using far too many exclamation points to convey their
-            feelings.  However, most newer email programs can display
-            images and text styles as well as basic alignment and
-            paragraph formatting. They do this with <glossterm
-            linkend="html">HTML</glossterm>, just like web pages do.
-        </para>
-        <note>
-          <title>HTML Mail is not a Default Setting</title>
-          <para>
-            Some people do not have HTML-capable mail clients, or
-            prefer not to receive HTML-enhanced mail because it is
-            slower to download and display. Because some people may
-            prefer not to get HTML mail,
-            <application>Evolution</application> sends plain text
-            unless you explicitly ask for HTML.  
-           </para>
-	 </note>
-
-	 <para> You can change the format of an email message between
-            plain text and HTML by choosing <menuchoice>
-            <guimenu>Format</guimenu> <guimenuitem>
-            HTML</guimenuitem></menuchoice>.
-	  </para>
-	  <para>
-            To send all your mail as HTML by default, set your mail
-            format preferences in the mail configuration dialog.  See
-            <xref linkend="config-prefs-mail-other"> for more
-            information.
-      </para>
-      <para>
-	HTML formatting tools are located in the toolbar just above
-	the space where you'll actually compose the message, and
-	they also appear in the <guimenu>Insert</guimenu> and
-	<guimenu>Format</guimenu> menus.
-      </para>
-      <para>
-	The icons in the toolbar are explained in <glossterm
-            linkend="tooltip">tool-tips</glossterm>, which appear when
-            you hold your mouse over the buttons.  The buttons fall
-            into four categories:
-            <variablelist>
-             <varlistentry>
-             <term>Headers and lists:</term>
-              <listitem>
-                <para>
-                  At the left edge of the toolbar, you can choose
-                  <guilabel>Normal</guilabel> for a default text style
-                  or <guilabel>Header 1</guilabel> through
-                  <guilabel>Header 6</guilabel> for varying sizes of
-                  header from large (1) to tiny (6). Other styles
-                  include <guilabel>preformat</guilabel>, to use the HTML
-                  tag for preformatted blocks of text, and three types
-                  of bullet points for the highly
-                  organized.
-                </para>
-              </listitem>
-           </varlistentry>
-	  <varlistentry>
-	    <term>Text style:</term>
-	    <listitem>
-	      <para>
-		Use these buttons to determine the way your letters
-		look.  If you have text selected, the style will
-		apply to the selected text.  If you do not have text
-		selected, the style will apply to whatever you type
-		next.  The buttons are:
-		<itemizedlist mark="none">
-		  <listitem><para>Push <guibutton>B</guibutton> for bold text</para></listitem>
-		  <listitem><para>Push <guibutton>I</guibutton> for italics</para></listitem>
-		  <listitem><para>Push <guibutton>U</guibutton> to underline</para></listitem>
-		  <listitem><para>Push <guibutton>S</guibutton> for a strikethrough.</para></listitem>
-		</itemizedlist>
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-              <term>Alignment:</term>
-	    <listitem>
-	      <para>
-		Located next to the text style buttons, these three
-		paragraph icons should be familiar to users of most
-		word processing software.  The leftmost button will
-		make your text aligned to the left, the center
-		button, centered, and the right hand button,
-		aligned on the right side.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-            <varlistentry>
-              <term>Indentation rules:</term>
-              <listitem>
-                <para>
-                  The button with the arrow pointing left will reduce
-                  a paragraph's indentation, and the right arrow will
-                  increase its indentation.
-               </para>
-            </listitem>
-          </varlistentry>
-
-            <varlistentry>
-              <term>Color Selection:</term>
-              <listitem>
-                <para>
-                  At the far right is the color section tool.  The
-                  colored box displays the current text color; to
-                  choose a new one, click the arrow button just to the
-                  right. If you have text selected, the color will
-                  apply to the selected text.  If you do not have text
-                  selected, the color will apply to whatever you type
-                  next.  You can select a background color or image by
-                  right-clicking on the message background and
-                  selecting <guilabel>Page</guilabel>.
-               </para>
-            </listitem>
-          </varlistentry>
-          </variablelist>
-        </para>
-        <para>
-	The <guimenu>Insert</guimenu> gives you opinions which let you
-           spruce up your email to make it more interesting:
-	<variablelist>
-	  <varlistentry>
-	    <term><guimenuitem>Link:</guimenuitem></term>
-	    <listitem>
-	      <para>
-		Lets you link some text to a website.  Use this tool to put hyperlinks in your HTML
-                  messages.  If you don't want special link text, you can just enter the address
-                  directly, and <application>Evolution</application>
-                  will recognize it as a link.  To add a link:
-		<orderedlist numeration="arabic">
-		  <listitem>
-		    <para>
-		      Select the text you wish to link from.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Right click on the text and click on <guibutton>Link</guibutton>.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Put the URL you want to use in the <guilabel>URL</guilabel> field.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Click <guibutton>OK</guibutton>.
-		    </para>
-		  </listitem>
-		</orderedlist>
-	      </para>
-	      <note>
-		<para>
-		  If you're typing a webpage address to be automatically formatted, keep in mind that a space terminates the link.
-		</para>
-	      </note>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guimenuitem>Image:</guimenuitem></term>
-	    <listitem>
-	      <para>
-		Lets you put an image alongside text.
-	      </para>
-	      <para>
-		To insert an image into your email:
-		<orderedlist numeration="arabic">
-		  <listitem>
-		    <para>
-		      Open a new email by clicking <guibutton>New Message</guibutton>
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Make sure that you have the
-		      <menuchoice>
-			<guimenu>Format</guimenu>
-			<guimenuitem>HTML</guimenuitem>
-		      </menuchoice>
-                      selector checked.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Click the <guibutton>Insert Image</guibutton> button in the toolbar, or select		   
-		         <menuchoice>
-			<guimenu>Insert</guimenu>
-			<guimenuitem>Image</guimenuitem>
-		      </menuchoice>.
-		      </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Choose your image by clicking the <guibutton>Browse</guibutton> button.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Press <guibutton>Insert</guibutton> to insert the image.
-		    </para>
-		  </listitem>
-		</orderedlist>
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term><guimenuitem>Rule:</guimenuitem></term>
-	    <listitem>
-	      <para>
-		Inserts a horizontal line into the text to help divide two
-		sections.
-	      </para>
-	      <para>
-		To insert a rule:
-		<orderedlist numeration="arabic">
-		  <listitem>
-		    <para>
-		      Open a new email by clicking <guibutton>New Message</guibutton>
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Make sure that you have the
-		      <menuchoice>
-			<guimenu>Format</guimenu>
-			<guimenuitem>HTML</guimenuitem>
-		      </menuchoice>
-                      selector checked.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Click the <guibutton>Rule</guibutton> button in the <guilabel>Toolbar</guilabel>.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Select the type of rule. You can use a plain
-		      line, a 3D line, or a yellow line with flowers.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Choose the size of the line, as a percentage of the width of the email window.
-		    </para>
-		  </listitem>
-
-		  <listitem>
-		    <para>
-		    Choose the alignment and style.  For the plain
-		    line, you can choose the thickness of the line,
-		    and whether it will be shaded, or solid.  For the
-		    other types, you can only choose alignment.
-		    </para>
-		  </listitem>
-
-		  <listitem>
-		    <para>
-		      Click <guibutton>Insert</guibutton> to insert the rule.
-		    </para>
-		  </listitem>
-		</orderedlist>
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>Table:</term>
-	    <listitem>
-	      <para>
-		Inserts a table into the text to help divide two
-		sections.
-	      </para>
-	      <para>
-		To insert a rule:
-		<orderedlist numeration="arabic">
-		  <listitem>
-		    <para>
-		      Open a new email by clicking <guibutton>New Message</guibutton>
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Make sure that you have the
-		      <menuchoice>
-			<guimenu>Format</guimenu>
-			<guimenuitem>HTML</guimenuitem>
-		      </menuchoice>
-                      selector checked.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Click the <guibutton>Table</guibutton> button in the <guilabel>Toolbar</guilabel>.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Select the <guibutton>Template</guibutton> you wish to use.  Each template has a slightly different feel and layout.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      If you so desire, you may change the other options such as: number of rows, columns, spacing of each cell, and more.
-		    </para>
-		  </listitem>
-		  <listitem>
-		    <para>
-		      Click the <guibutton>Insert</guibutton> button.
-		    </para>
-		  </listitem>
-		</orderedlist>
-	      </para>
-	    </listitem>
-	  </varlistentry>
-	</variablelist>
-	To add a hyperlink to your HTML message:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select the text you want to display as a link.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Right click on text and select
-	      <guimenuitem>Link</guimenuitem>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Enter the address you wish to link to in the
-	      <guilabel>URL</guilabel> field.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Press <guibutton>OK</guibutton>.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-
-      <para>
-	To add an image to your HTML message:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	     Select
-	      <menuchoice>
-		<guimenu>Insert</guimenu>
-		<guimenuitem>Image</guimenuitem>
-	      </menuchoice>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>Browse</guibutton> to select the image
-	      you want to include in your email.
-	    </para>
-	  </listitem>
-
-	  <listitem>
-	    <para>
-	    Along the right side of the window, choose the alignment,
-	    border, and other attributes of the image. If you change
-	    the size attributes, the image will be shrunk or stretched
-	    to fit the size you have chosen.
-	    </para>
-	  </listitem>
-
-	  <listitem>
-	    <para>
-	     If you would like to make the image a clickable link,
-	     enter a URL in the <guilabel>Link</guilabel> tab of the
-	     window.
-	    </para>
-	  </listitem>
-
-	  <listitem>
-	    <para>
-	      When you are finished, press
-	      <guibutton>Insert</guibutton> to include the image in
-	      your message.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-      <para>
-        You can insert an image into the background of your message by
-        right-clicking on the message background and selecting
-        <guimenuitem>Page</guimenuitem>. From that dialog, you may
-        also select background color and set other general options
-        about the html message you are composing.
-     </para>
-      <sect3 id="html-templates">
-	<title>HTML Templates</title>
-	<para>
-          <application>Evolution</application> not only allows you to
-	  decorate your email with HTML text and graphics, but
-	  provides you with prebuilt templates for you to use when
-	  making these improvements.  You can use these to emphasize a
-	  point or frame an image in an attractive manner.
-        </para>
-	<para>
-	  To include a template into your HTML based email:
-	  <orderedlist numeration="arabic">
-	    <listitem>
-	      <para>
-		Create a new email by clicking <guibutton>New Message</guibutton>.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Make sure that the
-		<menuchoice>
-		  <guimenu>
-		    Format
-		  </guimenu>
-		  <guimenuitem>
-		    HTML
-		  </guimenuitem>
-		</menuchoice>
-		selector is checked.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Click the <guibutton>HTML Template</guibutton> button in the 
-		<guilabel>Toolbar</guilabel> or select 		
-		<menuchoice>
-		  <guimenu>
-		  Insert
-		  </guimenu>
-		  <guimenuitem>
-		    HTML Template
-		  </guimenuitem>
-		</menuchoice>
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Select the template type in the
-		<guilabel>Template</guilabel> selection box. Your
-		options are <guilabel>Note</guilabel> and
-		<guilabel>Image Frame</guilabel>.  
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-	      Set the size and alignment of the HTML template.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		Click <guibutton>Insert</guibutton> to insert it where the 
-		cursor is.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Once you have inserted the template, click on the text
-		in the template, and enter the text you want to use.
-              </para>
-	      <para>
-		If you have selected an image frame template,
-		right-click on the image and select
-		<guimenuitem>Image</guimenuitem> to select the image
-		you want to place in the frame.
-	      </para>
-	    </listitem>
-	  </orderedlist>
-	</para>
-      </sect3>
-      <sect3 id="composer-tables">
-	<title>Tables in Email</title>
-	<para>
-	  <application>Evolution</application> allows you to put
-	  tables in your HTML email to help organize your thoughts.
-	  These tables are a simplified version of what you might find
-	  in a spreadsheet program like
-	  <application>Gnumeric</application>.
-	</para>
-	<para>
-	  To include a table in your email:
-	  <orderedlist numeration="arabic">
-	    <listitem>
-	      <para>
-		Create a new email by clicking <guibutton>New Message</guibutton>.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Make sure you have the
-		<menuchoice>
-		  <guimenu>
-		    Format
-		  </guimenu>
-		  <guimenuitem>
-		    HTML
-		  </guimenuitem>
-		</menuchoice>
-		selector checked.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-	      Select
-		<menuchoice>
-		  <guimenu>
-		    Insert
-		  </guimenu>
-		  <guimenuitem>
-		    Table
-		  </guimenuitem>
-		</menuchoice>
-		or click the <guiicon>Table</guiicon> button in the
-		toolbar.
-	      </para>
-	    </listitem>
-
-	    <listitem>
-	      <para>
-		Select the template, or style, you want to use for the
-		table.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Set the number of rows and columns you want.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Click the <guibutton>Insert</guibutton> button.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Click in a cell and type to insert text into the table.
-	      </para>
-	    </listitem>
-	  </orderedlist>
-	</para>
-	<para>
-	  You can also edit a table after creation.  Just right-click
-	  on it and select <guimenuitem>Table</guimenuitem> to open
-	  the table editing window again. Or, you can select items
-	  from the <guimenu>Table Delete</guimenu> and <guimenu>Table
-	  Insert</guimenu> menus.
-	  </para>
-	
-	<para>
-	  <tip id="table-tip">
-	  <title>Deleting an Entire Table</title>
-	  <para>
-	    You can delete an entire table by right-clicking on
-            a table or other HTML object in a message, and selecting
-	  <menuchoice>
-	    <guimenu>Table Delete</guimenu>
-	    <guimenuitem>Table</guimenuitem> </menuchoice>.  In an
-	    HMTL message, your signature, templates, and image
-	    inclusions all have tables around them, and you can remove
-	    them completely and quickly with this shortcut.
-	  </para>
-         </tip>
-        </para>
-
-      </sect3>
-    </sect2>
-    
-    <sect2 id="usage-mail-getnsend-fwd">
-        <title>Forwarding Mail</title>
-        <para>
-          The post office forwards your mail for you when you change
-          addresses, and you can forward a letter if it comes to you by mistake.
-          The email <guilabel>Forward</guilabel> button
-          works in much the same way.  It's particularly useful if you
-          have received a message and you think someone else would
-          like to see it.  You can forward a message as an attachment
-          to a new message (this is the default) or
-          you can send it <glossterm linkend="inline">inline</glossterm> as a quoted
-          portion of the message you are sending.  Attachment
-          forwarding is best if you want to send the full, unaltered
-          message on to someone else.  Inline forwarding is best if
-          you want to send portions of a message, or if you have a
-          large number of comments on different sections of the
-          message you are forwarding.  Remember to note from whom the
-          message came, and where, if at all, you have removed or
-          altered content.
-        </para>
-        <para>
-          To forward a message you are reading, press
-          <guibutton>Forward</guibutton> on the toolbar, or select
-          <menuchoice> <guimenu>Message</guimenu>
-          <guimenuitem>Forward</guimenuitem> </menuchoice>.  If you
-          prefer to forward the message <glossterm linkend="inline">inline</glossterm>
-          instead of attached, select <menuchoice>
-          <guimenu>Message</guimenu> <guimenuitem>Forward
-          Inline</guimenuitem> </menuchoice> from the menu.  Choose an
-          addressee as you would when sending a new message; the
-          subject will already be entered, but you can alter it.
-          Enter your comments on the message in the
-          <interface>composition frame</interface>, and press
-          <guibutton>Send</guibutton>.
-        </para>
-      </sect2>
-
-      <sect2 id="usage-mail-getnsend-ettiquette">
-        <title>Seven Tips for Email Courtesy</title>
-        <para>
-
-          <itemizedlist>
-
-            <listitem>
-              <para>
-                 Don't send spam or forward chain mail.  If you must,
-                 watch out for hoaxes and urban legends, and make sure
-                 the message doesn't have multiple layers of
-                 greater-than signs, (&gt;) indicating multiple layers
-                 of careless in-line forwarding.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Always begin and close with a salutation. Say "please"
-                and "thank you," just like you do in real life. You
-                can keep your pleasantries short, but be pleasant!
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                WRITING IN CAPITAL LETTERS MEANS YOU'RE SHOUTING!
-                Don't write a whole message in capital letters.  It
-                hurts people's ears.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-               Check your spelling and use complete sentences. By
-               default, <application>Evolution</application> will put
-               a red line beneath words it doesn't recognize, as you
-               type them.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Don't send nasty emails (flames).  If you get one,
-                don't write back.
-              </para>
-            </listitem>
-	  
-	  <listitem>
-	    <para>
-	      When you reply or forward, include just enough of
-	      the previous message to provide context: not too
-	      much, not too little.
-	    </para>
-	  </listitem>
-
-	  <listitem>
-	    <para>
-	      Don't send spam.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-      <para> Happy mailing! </para>
-    </sect2>
-  </sect1>
-  <sect1 id="rsvp-stuff">
-    <title>RSVPs in Mail</title>
-    <para>
-      If you create an event in the calendar component, you can then
-      send invitations to the attendee list through the
-      <application>Ximian Evolution</application> email tool.  The
-      invitation card is sent as an attachment in iCal format.
-    </para>
-    <para>
-      If you click on the attachment button and click the
-      <guibutton>View Inline</guibutton>, <application>Ximian
-      Evolution</application> will show you information about the
-      meeting, and let you respond to the meeting in several ways.
-      Select the response that you would like, and then click the
-      <guibutton>OK</guibutton> button.
-   </para>
-   <para>
-  Your options are:
-      <variablelist>
-	<varlistentry>
-	  <term>Accept:</term>
-	  <listitem>
-	    <para>
-	  Select this entry if you will attend the meeting.  When you
-	  click the <guibutton>OK</guibutton> button, the meeting will
-	  be entered into your calendar.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term>Tentatively Accept:</term>
-	  <listitem>
-	    <para>
-	  Select this entry if you will probably attend the meeting.
-	  When you click the <guibutton>OK</guibutton> button, the
-	  meeting will be entered into your calendar, but marked as
-	  tentative.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term>Decline:</term>
-	  <listitem>
-	    <para>
-	  Select this item if you will be unable to attend the
-	  meeting. The meeting will not be entered into your calendar
-	  when you click the <guibutton>OK</guibutton>, although your
-	  response will be sent to the meeting host if you have
-	  checked the <guilabel>RSVP</guilabel> box.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term>RSVP:</term>
-	  <listitem>
-	    <para>
-	     Check this box if you would like your response sent to
-	     the meeting organizers.
-	    </para>
-	  </listitem>
-	</varlistentry>
-     </variablelist>
-    </para>
-  </sect1>
-
-  <sect1 id="usage-mail-subscriptions">
-    <title>Subscription Management</title>
-    <para>
-      Since IMAP folders exist on the server, and opening them or
-      checking them takes time, you need fine-grained control over the
-      way that you use IMAP folders.  That's why
-      <application>Evolution</application> has an IMAP subscriptions
-      manager.  If you prefer to have every mail folder displayed, you
-      can select that option as well. However, if you'd like to choose
-      specific items in your mailbox, and exclude others, you can use
-      the subscription management tool to do that.
-    </para>
-    <para>
-    Here's how:
-      <orderedlist numeration="arabic">
-	
-	<listitem>
-	  <para>
-	   Select
-	   <menuchoice><guimenu>Tools</guimenu><guimenuitem>Subscribe
-	   to Folders</guimenuitem></menuchoice>.
-	  </para>
-	</listitem>
-
-	<listitem>
-	  <para>
-	    If you have accounts on multiple IMAP servers, select the
-	    server where you'd like to manage your
-	    subscriptions. <application>Evolution</application> will
-	    display a list of available files and folders.
-	  </para>
-	</listitem>
-
-	<listitem>
-	  <para>
-            Select a file or folder by clicking on it.  You will want
-            to select at least the <guilabel>INBOX</guilabel>
-            folder. Depending upon the way your IMAP server is
-            configured, the list of available files may include
-            non-mail folders. If it does, you can ignore them.
-	  </para>
-	</listitem>
-
-	<listitem>
-	  <para>
-	    Click the <guibutton>Subscribe</guibutton> to add it to
-	    the subscribed list.
-	  </para>
-	</listitem>
-	<listitem>
-	  <para>
-	    When you have subscribed to the folders you want, close
-	    the window.
-	  </para>
-	</listitem>
-      </orderedlist>
-    </para>
-  </sect1>
-
-  <sect1 id="encryption">
-    <title>Encryption</title>
-    <sect2 id="encryption-whatis">
-      <title>What is Encryption?</title>
-      <para>
-	Encryption is an ancient method of keeping information safe
-	from prying eyes. <application>Evolution</application> helps
-	you you protect your privacy by using
-	<application>gpg</application>, an implementation of strong
-	<glossterm linkend="public-key-encryption">Public Key
-	Encryption.</glossterm>
-      </para>
-
-	<note id="pub-priv">
-	  <title>Public Key?  Private Key?  What is the difference?</title>
-	  <para>
-	    GPG uses two keys: public and private.  You can give your
-	    public key to anyone you want to recieve
-	    encrypted messages, or put it on a public key server so
-	    that people can look it up before contacting you.
-	    <emphasis>Never give your private key to anyone,
-	    ever</emphasis>.  Your private key lets you decrypt any
-	    message encrypted with your public key.
-	  </para>
- 	</note>
-
-      <para>
-        Using encryption takes a bit of forethought.  When you send a
-        message that is encrypted, you must encrypt it using your
-        intended recipient's public key.  To <emphasis>get</emphasis>
-        an encrypted message, you must make sure that the sender has
-        your public key in advance.
-      </para>
-
-      <para>
-	You can use encryption in two different ways:
-        <simplelist>
-          <member>
-             Encrypt the entire message, so that nobody but the recipient can read it.
-          </member>
-          <member>
-            Attach an encrypted signature to a plain text message, so
-            that the recipient can read the message without decrypting it, and 
-            only needs decryption to verify the sender's identity.
-           </member>
-         </simplelist>
-      </para>
-
-	<example> 
-         <title>Sending an Encrypted Messagee</title>
-	  <para>
-	    Kevin wants to send an encrypted message to his friend
-	    Rachel.  He looks up her public key on a general key
-	    server, and then tells
-	    <application>Evolution</application> to encrypt the
-	    message.  The message now reads "@#$23ui7yr87#@!48970fsd."
-	    When the information gets to Rachel, she decrypts it using
-	    her private key, and it appears as plain text for her to
-	    read.
-	  </para>
-	</example>
-      <tip id="always-sign">
-	<title>Always Sign</title>
-	<para>
-	  You can set <application>Evolution</application> to always sign your email messages:
-	  <orderedlist numeration="arabic">
-	    <listitem>
-	      <para>
-		Open your account preferences.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Open the <guilabel>Security</guilabel> tab.
-	      </para>
-	    </listitem>
-	    <listitem>
-	      <para>
-		Click the <guibutton>Always sign outgoing messages when using this account</guibutton> button.
-	      </para>
-	    </listitem>
-	  </orderedlist>
-	</para>
-      </tip>
-    </sect2>
-
-    <sect2 id="encryption-keygen">
-      <title>Making Encryption Keys</title>
-      <para>
-        Before you can get or send encrypted mail, you need to
-	generate your public and private keys with GPG. Here's how:
-      </para>
-      <tip>
-	<title>GPG Versions</title>
-	<para>
-	  This manual covers version 1.0.6 of GPG.  If your version is
-	  different, this may not be entirely accurate.  You may find
-	  out your version number by typing in: <command>gpg
-	  --version</command>.
-	</para>
-      </tip>
-      <para>
-        <orderedlist numeration="arabic">
-	  <listitem>
-      	   <para>
-            Open a terminal and type <command>gpg --gen-key</command>.
-	  </para>
-         </listitem>
-
-	  <listitem>
-      	   <para> 
-             Choose the default algorythm, "DSA and ElGamal."
-	  </para>
-         </listitem>
-
-	  <listitem>
-      	   <para>
-            Choose a key length. The default, 1024 bits, should be
-            long enough.
-	  </para>
-         </listitem>
-
-	  <listitem>
-      	   <para>
-             Decide if you want your key to expire automatically, and if so, when.
-	  </para>
-         </listitem>
-
-
-	  <listitem>
-      	   <para>
-            Enter your name, email address, and any additional
-            personal information you think is appropriate. Do not
-            falsify this information, because it will be needed to
-            verify your identity later on.
-	  </para>
-         </listitem>
-
-	  <listitem>
-      	   <para>
-             Next, enter your passphrase. It does not have to be the
-             same as your email password or your login password. In
-             fact, it probably shouldn't. Don't forget it. If you lose
-             it, your keys will be useless and you will be unable to
-             decrypt messages sent to you with those keys.
-	  </para>
-         </listitem>
-
-	  <listitem>
-      	   <para>
-             Now, GPG will generate your keys.  This may take awhile,
-             so feel free to do something else while it's
-             happening. In fact, using your computer for something
-             else actually helps to generate better keys, because it
-             increases the randomness in the key generation seeds.
-	  </para>
-         </listitem>
-	</orderedlist>
-      </para>
-      <para>
-	Once the keys are generated, you can view your key information
-        by typing <command>gpg --list-keys</command>.  You should see
-        something similar to this:
-        <programlisting>
-	    /home/you/.gnupg/pubring.gpg
-	    ----------------------------
-	    pub 1024D/32j38dk2 2001-06-20 you &lt;you@your-address.com&gt;
-	    sub 1024g/289sklj3 2001-06-20 [expires: 2002-11-14]
-	</programlisting>
-      </para>
-      <para>
-         GPG will create one list, or keyring, for your public keys
-         and one for your private keys. All the public keys you know
-         are stored in the file
-         <filename>~/.gnupg/pubring.gpg</filename>. If you want to
-         give other people your key, send them that file.
-      </para>
-      <para>
-          If you wish, you can upload your keys to a keyserver. Here's
-          how:
-        <orderedlist>
-	  <listitem>
-	    <para>
-              Check your public key ID with <command>gpg
---list-keys</command>. It will be the string after 1024D on the line
-beginning with "pub." In this example, it's 32j38dk2.
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	     Enter the command <command>gpg --send-keys --keyserver
-wwwkeys.pgp.net 32j38dk2</command>.  Substitute your key ID for
-32j38dk2. You will need your password to do this.
-             </para>
-           </listitem>
-    </orderedlist>
-
-	<note id="why-keyserver">
-	  <title>Why Use a Keyserver?</title>
-	  <para>
-	    Keyservers store your public keys for you so that your
-	    friends can decrypt your messages.  If you choose not to
-	    use a keyserver, you can manually send your people public
-	    key, include it in your signature file, or put it on your
-	    own web page. However, it's easier to publish them once,
-	    and then let people download them from the keyserver when
-	    they want.
-	  </para>
-	</note>
-
-      </para>
-    </sect2>
-
-    <sect2 id="encrypt-getting-key">
-      <title>Getting and Using Public Keys</title>
-      <para>
-	To encrypt a message to your someone else you'll need to use
-	their public key in combination with your private key.
-	<application>Evolution</application> does that for you, but
-	you still need to get their key and add it to your keyring.
-     </para>
-     <para>
-        To get public keys from a public key server, enter the
-        command:
-	<command>
-	  gpg --recv-keys --keyserver wwwkeys.pgp.net keyid
-	</command>, substituting "keyid" for your recipient's ID.  You
-	will need to type in your password, and then their ID will
-	automatically be added to your keyring. When you send mail to
-	them, <application>Evolution</application> will allow you to
-	encrypt your messages.
-      </para>
-      <para>
-        If someone sends you their public key directly, save it as a
-        plain text file and enter the command <command>gpg
-        filename</command>. This will add it to your keyring.
-      </para>
-    </sect2>
-
-    <sect2 id="encrypt-evo-integ">
-      <title>Setting up Evolution's Encryption</title>
-      <para>
-	You'll need to open
-	<menuchoice>
-	  <guimenu>Tools</guimenu>
-	  <guimenuitem>Mail Settings</guimenuitem>
-	</menuchoice>
-	Once there, select the account with which you'd like to send
-	and recieve encrypted mail, and click the
-	<guibutton>Edit</guibutton> button.  In the
-	<guilabel>Security</guilabel> tab is a section labeled
-	<guilabel>Pretty Good Privacy</guilabel>.  Enter your key ID
-	and click <guibutton>OK</guibutton>.  Your key is now
-	integrated into your identity in
-	<application>Evolution</application>.
-      </para>
-      <note>
-	<title>What is my Key ID again?</title>
-	<para>
-	  <application>Evolution</application> requires that you know your key ID.  If you don't remember it, you can find it by typing <command>gpg --list-keys</command> in a console window.  Your key ID will be an eight character string with random numbers and letters.
-	</para>
-      </note>
-    </sect2>
-
-    <sect2 id="encrypt-sending">
-      <title>Sending Encrypted Messages</title>
-      <para>
-	As you know, you can use encryption to hide the entire
-	message, or just to verify your signature. Once you've
-	generated your public and private keys, and have the public
-	keys of the people to whom you want to send mail, here's what
-	to do:
-      </para>
-    </sect2>
-    
-    <sect2 id="sign-msg">
-      <title>Signing a Message</title>
-      <para>
-	To sign a message, choose:
-	<menuchoice>
-	  <guimenu>Security</guimenu>
-	  <guimenuitem>PGP Sign</guimenuitem>
-	</menuchoice>
-	.  You will be prompted for your PGP password.  Once you enter it,
-	click <guibutton>OK</guibutton> and your message will be signed.
-      </para>
-    </sect2>
-      
-      <sect2 id="encrypt-msg">
-	<title>Encrypting a Message</title>
-	<para>
-	  Encrypting a message is very similar to signing a message.
-	  Just choose the menu item
-	  <menuchoice>
-	    <guimenu>Security</guimenu>
-	    <guimenuitem>PGP Encrypt</guimenuitem>
-	  </menuchoice>
-	</para>
-      </sect2>
-      <sect2 id="unencrypting">
-	<title>Unencrypting a Recieved Message</title>
-	<para>
-	  If you get an encrypted message, you will need to decrypt it
-	  before you read it. Remember, the sender has to have your
-	  public key before they can send you an encrypted message.
-	</para>
-	<para>
-	  When you view the message,
-	  <application>Evolution</application> will ask you for your
-	  PGP password.  Enter it, and the message will be displayed
-	  properly.  
-       </para>
-    </sect2>
-  </sect1>
-</chapter>
diff --git a/help/no/usage-mainwindow.sgml b/help/no/usage-mainwindow.sgml
deleted file mode 100644
index b7ff02ecf7..0000000000
--- a/help/no/usage-mainwindow.sgml
+++ /dev/null
@@ -1,1174 +0,0 @@
-<!--
-<!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
--->
-<chapter id="usage-mainwindow">
-
-  <title>Getting Started with Ximian Evolution</title>
-
-    <sect1 id="what"> 
-      <title>What is Ximian Evolution, and What Can It Do for Me?</title>
-      <para>
-        Information is useless unless it's organized and accessible;
-        it's hardly even worth the name if you can't look at it and be
-        <emphasis>informed</emphasis>.  The goal of
-        <application>Ximian Evolution</application> is to make the
-        tasks of storing, organizing, and retrieving your personal
-        information easier, so you can work and communicate with
-        others.  That is, it's a highly evolved <glossterm
-        linkend="groupware">groupware</glossterm> program, an integral
-        part of the Internet-connected desktop.
-      </para>
-      <para>
-        In other words, <application>Ximian Evolution</application> is
-        a tool to help you get your work done.
-      </para>
-      <para>
-        <application>Ximian Evolution</application> is Free Software.  The
-        program and its source code are released under the terms of
-        the GNU <ulink type="help"
-        url="gnome-help:gpl"><citetitle>General Public License
-        (GPL)</citetitle></ulink>, and the documentation falls under
-        the <ulink type="help" url="gnome-help:fdl"><citetitle>Free
-        Documentation License</citetitle></ulink> (FDL). For more
-        information about the GPL and the FDL, visit the Free Software
-        Foundation's website at <ulink
-        url="http://www.fsf.org">http://www.fsf.org</ulink>.
-      </para>
-
-      <para>
-        <application>Ximian Evolution</application> can help you work in a
-        group by handling email, address and other contact
-        information, and one or more calendars.  It can do that on one
-        or several computers, connected directly or over a network,
-        for one person or for large groups.
-      </para>
-
-    <para>
-      With <application>Ximian Evolution</application>, you can
-      accomplish your most common daily tasks faster.  For example, it
-      takes only one or two clicks to enter an appointment or an
-      address card sent to you by email, or to send email to a contact
-      or appointment.  <application>Ximian Evolution</application>
-      makes displays faster and more efficient, so searches are faster
-      and memory usage is lower.  People who get lots of mail will
-      appreciate advanced features like <link
-      linkend="usage-mail-organize-vFolders"> Virtual Folders</link>,
-      which let you save searches as though they were ordinary mail
-      folders.
-    </para>
-  </sect1>
-
-  <sect1 id="usage-mainwindow-starting">
-    <title>The First Time you Start Ximian Evolution</title>
-    <para>
-      To start <application>Ximian Evolution</application>, do either
-      of the following: 
-      <itemizedlist>
-      <listitem>
-      <para>
-      Select <menuchoice><guimenu>Programs</guimenu>
-      <guimenuitem>Evolution</guimenuitem> </menuchoice> from your
-      menu panel.
-      </para>
-      </listitem>
-
-      <listitem>
-      <para>
-      Type <command>evolution</command> at the command line.
-      </para>
-      </listitem>
-     </itemizedlist>
-     </para>
- 
- <para>
-     The first time you run the program, it will create a directory
-      called <filename>evolution</filename> in your home directory,
-      where it will store all of its local data.  Then, it will open a
-      first-run assistant to help you set up mail accounts and import
-      data from other applications.
-    </para>
-    <para>
-      Using the first-run assistant will take approximately two to
-      five minutes.
-    </para>
-
-    <sect2 id="first-step">
-      <title>Defining Your Identity</title>
-      <para>
-	The Identity window is the first of four steps in the
-	assistant.  The identity step will ask you to enter your basic
-	personal information.  You can define multiple identities
-	later on with the <menuchoice><guimenu>Tools</guimenu>
-	<guimenuitem>Mail Settings</guimenuitem></menuchoice> tool.
-	<itemizedlist>
-	  <listitem>
-	    <para>
-	      Full Name: Your full name (Example: John Doe).
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Email Address: Your email address (Example: john@doe.com)
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Organization: The company where you work (optional).
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Signature file: If you'd like to use an email
-	      <glossterm linkend="signature">signature</glossterm>,
-	      select your signature file here.  Normally, the
-	      signature will be the contents of the
-	      <filename>.signature</filename> file in your home
-	      directory.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-    </sect2>
-
-    <sect2 id="second-step">
-      <title>Recieving Email</title>
-      <para>
-	The <guilabel>Recieving Email</guilabel> step lets you configure
-	receving email people have sent you.
-	<itemizedlist>
-	  <listitem>
-	    <para>
-	      Server Type: There are numerous types of servers
-	      from which <application>Ximian Evolution</application>
-	      can fetch your mail.  Ask your system administrator if
-	      you're not sure which of the following are available to
-	      you:
-	      <itemizedlist>
-		<listitem>
-		  <para>
-		    POP: Downloads your email to your hard disk for
-		    permanent storage.
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    IMAP: Keeps the email on your server so you
-		    can access your email from multiple systems. 
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Unix mail spool file: If you run a mail
-		    server on your desktop computer, choose this
-		    option.
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Standard Unix .mbox file: If you want
-		    <application>Ximian Evolution</application> to
-		    read mail from a specific file, or if you download
-		    mail with another application, choose this option.
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Qmail maildir format files: If you download your
-		    mail using qmail, you'll want to use this.
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    None: Select this if you do not plan to
-		    check mail with this account.
-		  </para>
-		</listitem>
-	      </itemizedlist>
-
-         <note id="imap-note-one">
-            <title>What's an IMAP Namespace?</title>
-                <para>
-                    For IMAP mail servers, your sysadmin may provide
-		    you with a specific namespace, the path on the
-		    IMAP server where you check for mail.  If you
-		    check your IMAP mail and your folder list includes
-		    files that don't look like mail folders, you
-		    probably need to change your mail
-		    namespace. Typical values are "mail" and "Mail."
-		    If you prefer, you can choose to subscribe to
-		    individual mail folders one at a time. For more
-		    information about how to use IMAP mail, see <xref
-		    linkend="usage-mail-subscriptions">.
-               </para>
-             </note>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Email Server: This is the address of the server you're
-	      downloading from.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Username: The username that you login to your email.  That
-	      is often the part before the @ in your email.
-	    </para>
-	    <para>
-	      Authentication Type: Chances are you are using
-	      <guilabel>Password</guilabel>.  Ask your administrator
-	      for more details.  You can have <application>Ximian
-	      Evolution</application> make sure you've chosen
-	      correctly by clicking <guibutton>Check for supported
-	      types</guibutton>.
-	    </para>
-	    <para>
-	      Remember Password: If you prefer to not enter your
-	      password every time you check email, press this button.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-      <tip id="exchange-info">
-	<title>Can Ximian Evolution Talk to Exchange?</title>
-	<para>
-	  <application>Ximian Evolution</application> can work with the
-	   <application>Microsoft Exchange</application> server over
-	   standard protocols such as POP or IMAP. Check with your
-	   system administrator to see if you can get POP or IMAP
-	   access to your email server.
-	</para>
-      </tip> 
-    </sect2>
-    <sect2 id="third-step">
-      <title>Sending Email</title>
-      <para>
-	The <guilabel>Sending Email</guilabel> step lets you configure sending 
-	email.
-	<itemizedlist>
-	  <listitem>
-	    <para>
-	      Server Type: There are numerous server types that
-	      <application>Ximian Evolution</application> supports for sending your
-	      mail.
-	      <itemizedlist>
-		<listitem>
-		  <para>
-		    SMTP: Downloads mail into your mailbox file.
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Sendmail: Uses another program to download your mail
-		    to your mailbox files.
-		  </para>
-		</listitem>
-	      </itemizedlist>
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Host: If you chose SMTP, enter the server's name
-	      or IP address here.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Server requires authentication: If your server
-	      requires you to enter a password to send mail, check
-	      this box.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Authentication Type: Chances are you are using
-	      <guilabel>Password</guilabel>.  If you're not sure, ask
-	      your system administrator or ISP, or have
-	      <application>Ximian Evolution</application> check for you by
-	      clicking <guibutton>Check for supported
-	      types</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Username: The account name you use when you login
-	      to check your email.  Normally, this is the part of your
-	      email address before the '@' character.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Remember Password: If you prefer to not enter
-	      your password every time you check email, press this
-	      button.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-    </sect2>
-
-  <sect2 id="fourth-step">
-      <title>Importing Mail (Optional)</title>
-      <para>
-	If <application>Ximian Evolution</application> finds mail or
-	address files from another application, it will offer to
-	import them.  If you're not sure which file format your mail
-	program uses, ask your system administrator.  If you want, you
-	can skip this step and return to it at a later time by
-	selecting
-	<menuchoice><guimenu>File</guimenu><guimenuitem>Import</guimenuitem></menuchoice>.
-      </para>
-      <para>
-	<application>Ximian Evolution</application> can import the following types of
-	files:
-          <variablelist>
-           <varlistentry>
-	    <term>VCard (.vcf, gcrd):</term>
-	    <listitem>
-	      <para>
-	         The addressbook format used by the GNOME, KDE, and
-	         many other contact management applications. You
-	         should be able to export to VCard format from any
-	         address book application.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>Microsoft Outlook Express 4 (.mbx):</term>
-	    <listitem>
-	      <para>
-                 Email file format used by Microsoft Outlook Express
-4. For other versions of Microsoft Outlook and Outlook Express, see
-the workaround described in the note below.
-	      </para>
-	    </listitem>
-	  </varlistentry>
-
-	  <varlistentry>
-	    <term>MBox (mbox):</term>
-	    <listitem>
-	      <para>
-	       The email box format used by Mozilla, Netscape,
-	       Ximian Evolution, Eudora, and many other email clients.
-  	     </para>
-	    </listitem>
-	  </varlistentry>
-       </variablelist>
-</para>
-<para>
-    <note>
-      <title>Microsoft Outlook and Outlook Express Users</title>
-      <para>
-	Microsoft Outlook, and versions of Outlook Express after
-	version 4, use proprietary formats that <application>Ximian
-	Evolution</application> cannot read or import.  For contacts,
-	you may have to email them to yourself and import them that
-	way.  For email, there is a simpler workaround:
-	<orderedlist numeration="arabic">
-
-	<listitem>
-	<para>
-	  While using Windows, import the files into Mozilla Mail (or
-	  another mailer, such as Netscape or Eudora, that uses the
-	  standard mbox format).
-        </para>
-        </listitem>
-	
-	<listitem>
-	<para>
-          Copy the files to the system or partition you use for
-          <application>Ximian Evolution</application>.  
-         </para>
-        </listitem>
-
-	<listitem>
-	<para>
-	  Use the <application>Ximian Evolution</application> import
-          tool to import the files.  There's more information about
-          why this works, and how, at the Ximian support website.
-      </para>
-        </listitem>
-     </orderedlist>
-    </para>
-    </note>     
-
-    <note>
-      <title>Netscape Users</title>
-      <para>
-	Before importing mail from Netscape, make sure you select
-	<menuchoice><guimenu>File</guimenu><guimenuitem>Compact All
-	Folders</guimenuitem></menuchoice>. If you don't,
-	<application>Ximian Evolution</application> will import and undelete
-	the messages in your Trash folders.
-      </para>
-    </note>     
-
-    </para>
-
-      <tip>
-	<title>Exporting Files From Ximian Evolution</title>
-	<para>
-          Ximian Evolution uses standard file types for all its information,
-          so you should have no trouble taking your information
-          elsewhere if you want.
-        </para>
-	<para>
-          For mail, that's <filename>mbox</filename>, for calendar,
-          <filename>iCal</filename>, and for the address book, vCards
-          in a <filename>.db3</filename> database.
-        </para>
-      </tip>
-    </sect2>
-  </sect1>
-
-  <sect1 id="ui-intro">
-    <title>What's What in Ximian Evolution</title>
-    <para>
-        Now that you've gotten the first-run configuration out of the
-        way, you're ready to get down to work.  Here's a quick
-        explanation of what's going on in your main
-        <application>Ximian Evolution</application> window.
-    </para>
-
-    <figure id="preface-basic-interface">
-      <title>The Ximian Evolution Main Window</title>
-      <screenshot>
-	<screeninfo>Inbox</screeninfo>
-	<mediaobject><imageobject><imagedata
-	fileref="figures/mainwindow-pic" format="png" srccredit="Kevin
-	Breit"> </imageobject></mediaobject>
-      </screenshot>
-    </figure>
-    
-    <para>
-      <inlinemediaobject><imageobject><imagedata  fileref="figures/full-1" format="png"></imageobject></inlinemediaobject>
-      <guilabel>Menubar</guilabel>
-    </para>
-    
-    <para>
-      The <guilabel>Menubar</guilabel> gives you access to nearly all the
-      features that can be found in <application>Ximian Evolution</application>.
-    </para>
-
-    <para>
-      <inlinemediaobject><imageobject><imagedata  fileref="figures/full-2" format="png"></imageobject></inlinemediaobject>
-      <guilabel>Toolbar</guilabel>
-    </para>
-
-    <para>
-      The <guilabel>Toolbar</guilabel> gives you fast and easy access to the
-      most used features in each component.
-    </para>
-    
-    <para>
-      <inlinemediaobject><imageobject><imagedata  fileref="figures/full-3" format="png"></imageobject></inlinemediaobject>
-      <guilabel>Shortcut Bar</guilabel>
-    </para>
-    
-    <para>
-      The <guilabel>Shortcut Bar</guilabel> lets you go to your favorite
-      components with the click of a click of a button.  
-    </para>
-    
-    <para>
-      <inlinemediaobject><imageobject><imagedata  fileref="figures/full-4" format="png"></imageobject></inlinemediaobject>
-      <guilabel>Status Bar</guilabel>
-    </para>
-    
-    <para>
-      Periodically, <application>Ximian Evolution</application> will need to quietly
-      display a message, or tell you the progress of a task.  This most
-      often happens when you're checking or sending email.  These progress
-      queues are shown here, in the <guilabel>Status Bar</guilabel>.  
-    </para>
-    
-    <para>
-      <inlinemediaobject><imageobject><imagedata  fileref="figures/full-5" format="png"></imageobject></inlinemediaobject>
-      <guilabel>Search Tool</guilabel>
-    </para>
-    
-    <para>
-      The <guilabel>Search Tool</guilabel> lets you search through your email
-      with precision so you can easily find what you're looking for.
-    </para>
-
-
-  <sect2 id="usage-mainwindow-shortcutbar">
-    <title>The Shortcut Bar</title>
-    <para>
-        <application>Ximian Evolution</application>'s most important job is
-        to give you access to your information and help you use it
-        quickly.  One way it does that is through the
-        <interface>shortcut bar</interface>, the column on the left
-        hand side of the main window.  The large buttons with names
-        like <guilabel>Inbox</guilabel> and
-        <guilabel>Contacts</guilabel> are the shortcuts, and you can
-        select different groups of shortcuts by clicking the
-        rectangular group buttons.
-    </para>
-    <para>
-       Take a look at the <guilabel>Shortcut Bar</guilabel>
-       The shortcut buttons in that category are:
-
-	    <variablelist>
-	      <varlistentry>
-		<term> <guibutton>Summary</guibutton>:</term>
-		<listitem>
-	    <para>
-		    Start your day here.  The Ximian Evolution
-		    <guilabel>Summary</guilabel> gives you a quick
-		    summary of new or important messages, daily
-		    appointments and urgent tasks.  You can customize
-		    its appearance and content, and use it to access
-		    Ximian Evolution services.
-		  </para>
-		</listitem>
-	      </varlistentry>
-
-	<varlistentry>
-	  <term> <guibutton>Inbox</guibutton>:</term>
-	  <listitem>
-	    <para>
-	      Click the <guibutton>Inbox</guibutton> button to start
-	      reading your mail.  Your Inbox is also where you can
-	      access Ximian Evolution's tools to filter, sort, organize, and
-	      search your mail.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-	<varlistentry>
-	  <term><guibutton>Calendar</guibutton>:</term>
-	  <listitem>
-	    <para>
-	      The Calendar can store your appointments and task lists
-	      for you.  Connected to a network, you can use it to keep
-	      a group of people on schedule and up to date.
-	    </para>
-	  </listitem>
-	</varlistentry>
-
-       <varlistentry>
-         <term><guibutton>Tasks</guibutton>:</term>
-	<listitem>
-	  <para>
-	     A full-size view of your calendar's task pad.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-	<varlistentry>
-	  <term><guibutton>Contacts</guibutton>:</term>
-	  <listitem>
-	    <para>
-	      The Addressbook holds contacts, with address, phone, and
-	      other personal information. Like calendar information,
-	      contact data can be synchronized with hand-held devices
-	      and shared over a network.
-	   </para>
-	  </listitem>
-	</varlistentry>
-
-<!-- NOT IMPLEMENTED YET
-
-
-	<varlistentry>
-	  <term> <guibutton>Notes:</guibutton></term>
-	<listitem>
-	  <para> The note pad is your catch-all tool: use it to take
-	    messages from phone conversations, keep small things
-	    organized, write <glossterm linkend="haiku">haiku</glossterm>, or whatever
-	    you like. This feature is not yet implemented, but will be
-	    soon. See <xref linkend="usage-notes"> for more
-	    information.
-	  </para>
-	</listitem>
-	</varlistentry>
--->
-	  
-	</variablelist>
-      </para>
-    </sect2>
-    <sect2 id="usage-mainwindow-folderbar">
-    <title>Folders and The Folder Bar</title>
-    <para>
-      The <interface>folder bar</interface> is a more comprehensive
-      way to view the information you've stored with
-      <application>Ximian Evolution</application>. It displays all your
-      appointments, address cards, and email in a tree that's a lot
-      like a <glossterm linkend="filetree">file
-      tree</glossterm>-- it starts small at the top, and branches
-      downwards. On most computers, there will be three or four
-      folders at the base.  First, of course, is the
-      <guilabel>Summary</guilabel>, a customizable summary of your
-      information. Below that are your <guilabel>Local
-      Folders</guilabel>, which hold all the
-      <application>Ximian Evolution</application> data that's stored on your
-      computer.  After that are your network servers: <glossterm
-      linkend="ldap">LDAP</glossterm> servers that host shared contact
-      directories, and <glossterm linkend="imap">IMAP</glossterm> mail
-      folders to which you subscribe.  Lastly, there are
-      <guilabel>vFolders</guilabel>, or virtual folders, discussed in
-      <xref linkend="usage-mail-organize-vfolders">,
-    </para>
-    <para>
-       
-      A typical <guilabel>Local</guilabel> folder contains the following folders:
-      <itemizedlist>
-	 <listitem>
-	    <para>
-	     <guilabel>Calendar</guilabel>, for appointments and
-	     event listings.
-	   </para>
-	 </listitem> 
-	 <listitem>
-	    <para>
-	    <guilabel>Contacts</guilabel>, for address cards.
-	   </para>
-	 </listitem>
-         <listitem>
-	    <para>
-	    <guilabel>Drafts</guilabel>, for messages you started and didn't finish.
-	   </para>
-	 </listitem>
-	 <listitem>
-	    <para>
-	     <guilabel>Inbox</guilabel>, for incoming mail. 
-	   </para>
-	 </listitem>
-
-	<listitem>
-	   <para>
-	    <guilabel>Outbox</guilabel>, for messages you have written
-	    but not yet sent.  This will be empty unless you use
-	    <application>Ximian Evolution</application> while offline.
-	   </para>
-	 </listitem>
-
-	<listitem>
-	   <para>
-	    <guilabel>Sent</guilabel>, for sent mail.
-	   </para>
-	 </listitem>
-
-	<listitem>
-	    <para>
-	    <guilabel>Trash</guilabel>, a vFolder view of all the
-	    messages you have marked for deletion but not yet
-	    <glossterm linkend="expunge">expunged</glossterm>.
-	   </para>
-	 </listitem>
-      </itemizedlist>
-
-    </para>
-    <tip id="foldertips">
-    <title>Navigating without the Folder Bar or the Shortcut Bar</title>
-       <para>
-         You don't need the folder bar or the shortcut bar to move
-         around the main window. You can use the <keycap>Tab</keycap>
-         key to switch from one part of the window to another. When
-         you hide the folder bar, there is a menu on the left side of
-         the window just below the toolbar to move about the folder
-         tree, even with the folder and shortcut bars hidden.
-       </para>
-     </tip>
-
-    <para>
-       If you get large volumes of mail, you'll want more folders than
-       just your Inbox.  To create a new folder:
-	<orderedlist numeration="arabic">
-	  <listitem>
-	    <para>
-	      Select
-	      <menuchoice> <guimenu>File</guimenu>
-		<guisubmenu>New</guisubmenu>
-		<guimenuitem>Folder</guimenuitem></menuchoice>
-	      <keycombo action="simul">
-		<keycap>Shift</keycap>
-		<keycap>Ctrl</keycap>
-		<keycap>E</keycap>
-	      </keycombo>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the name of the folder in the <guilabel>Folder
-		Name</guilabel> field.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Select the folder type.  The available options are.
-	      <itemizedlist>
-		<listitem>
-		  <para>
-		    Calendar
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Contacts
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Mail
-		  </para>
-		</listitem>
-		<listitem>
-		  <para>
-		    Tasks
-		  </para>
-		</listitem>
-	      </itemizedlist>
-
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Choose the location of the new folder.
-	    </para>
-	  </listitem>
-	</orderedlist>
-      </para>
-    
-    <sect3 id="subfolders">
-    <title>Subfolders</title>
-      <para>
-        <application>Ximian Evolution</application> lets you nest folders
-	inside of each other, so that you can have a detailed
-	organizational system.
-      </para>
-
-       <note>
-	  <title>Folders Have Limits</title>
-	  <para>
-              Calendars must go in calendar folders, mail in mail
-	      folders, and contacts in contact folders.
-           </para>
-	</note>
-
-    <para>
-      Right-clicking will bring up a menu for just about anything in
-      <application>Ximian Evolution</application>.  If you right-click on a
-      folder, you'll have a menu with the following options:
-      <itemizedlist>
-	<listitem><para><guimenuitem>View</guimenuitem>, to view the folder. </para></listitem>
-	<listitem><para><guimenuitem>Open in New Window</guimenuitem> to view the folder in another window. </para></listitem>
-	<listitem><para><guimenuitem>Move</guimenuitem>, to move the folder to another location. </para></listitem>
-	<listitem><para><guimenuitem>Copy</guimenuitem>, to duplicate the folder. </para></listitem>
-	<listitem><para><guimenuitem>Delete</guimenuitem>, to delete the folder and all its contents. </para></listitem>
-	<listitem><para><guimenuitem>Rename</guimenuitem>, to change its name. </para></listitem>
-	<listitem><para><guimenuitem>Create New Folder</guimenuitem>, to create another folder in the same location. </para></listitem>
-	<listitem><para><guimenuitem>Add to Shortcut Bar</guimenuitem>, to add the folder to your shortcut bar. </para></listitem>
-	<listitem><para><guimenuitem>Properties</guimenuitem>, to view or change the folder properties. </para></listitem>
-      </itemizedlist>
-    </para>
-    <para>
-      You can also rearrange folders and messages by dragging and
-      dropping them.
-    </para>
-
-	<para>
-	  Any time new mail arrives in a mail folder, that folder
-	  label is displayed in bold text, along with the number of
-	  new messages in that folder.
-	</para>
-      </sect3>
-    </sect2>
-    
-    <sect2 id="usage-mainwindow-menubar">
-    <title>The Menu Bar</title>
-    <para>
-      The <interface>menu bar</interface>'s contents will always
-      provide all the possible actions for any given view of your
-      data.  If you're looking at your Inbox, most of the menu items
-      will relate to mail; some will relate to other components of
-      <application>Ximian Evolution</application> and some, especially those
-      in the <guimenu>File Menu</guimenu> will relate to the
-      application as a whole. 
-   </para> 
-   <para>
-      <variablelist>
-        <varlistentry>
-          <term> <guimenu>File</guimenu>:</term>
-
-          <listitem><para> Anything related to a file or to the
-            operations of the application generally falls under this
-            menu: creating things, saving them to disk, printing them,
-            and quitting the program itself.  </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>Edit</guimenu>:</term>
-          <listitem><para>
-              The <guimenu>Edit</guimenu> menu holds
-              useful tools that help you edit text and move it around.
-          </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>View</guimenu>:</term>
-          <listitem><para>
-            This menu lets you decide how <application>Ximian Evolution</application> 
-            should look. Some of the features control the appearance of 
-            <application>Ximian Evolution</application> as a whole, and others 
-            the way a particular kind of information appears.
-          </para></listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term> <guimenu>Actions</guimenu>:</term>
-          <listitem><para>
-	    Holds actions which maybe applied to a message.  Normally,
-	    if there is only one target for the action -- for
-	    example, replying to a message -- you can find it in
-	    the <guimenu>Actions</guimenu> menu.
-          </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>Tools</guimenu>:</term>
-          <listitem><para>
-             Tools for configuring, changing, and
-          setting up preferences go here.  For mail, that means things like
-          <guimenuitem>Mail Configuration</guimenuitem> and the
-          <guimenuitem>Virtual Folder Editor</guimenuitem>.  For the
-          <interface>Calendar</interface> and the <interface>Contact
-          Manager</interface>, it's color, network, and layout
-          configuration.
-          </para></listitem>
-        </varlistentry>
-
-       <varlistentry>
-          <term> <guimenu>Help</guimenu>:</term>
-          <listitem><para>
-             Select among these items to open the 
-             <application>Help Browser</application> 
-             and read the <application>Ximian Evolution</application> manual.
-          </para></listitem>
-        </varlistentry>
-      </variablelist>
-   </para>
-
-   <para>
-      Once you've familiarized yourself with the <interface>main
-      window</interface> you can start doing things with it.  We'll
-      start with the <guilabel>Summary</guilabel>, which provides a
-      quick overview of your <application>Ximian
-      Evolution</application> information.
-    </para>
-    </sect2>
-    <sect2 id="basics-summary">
-      <title>Introducing the Summary</title>
-      <para>
-         The Ximian Evolution Summary provides you with a quick
-         run-down of important information: your appointments for a
-         given day, how much new mail you have, headlines from
-         selected news services, and so forth. To see the Summary,
-         click on the <guibutton>Summary</guibutton> button in the
-         shortcut bar, or select the <guilabel>Summary</guilabel>
-         folder in the folder bar.
-      </para>
-
-      <para>
-<figure>
-	<title>The Evolution Summary</title>
-
-<screenshot>
-<graphic  format="png" fileref="figures/summary" srccredit="Kevin Breit">
-</screenshot>
-</figure>
-      </para>
-
-<para>
-<inlinemediaobject><imageobject><imagedata fileref="figures/full-1" format="png"></imageobject></inlinemediaobject> <guilabel>Weather Summary</guilabel>
-</para>
-<para>
-Shows you the latest weather updates from hundreds of cities around the world.
-</para>
-<para>
-<inlinemediaobject><imageobject><imagedata fileref="figures/full-2" format="png"></imageobject></inlinemediaobject> <guilabel>News Feeds</guilabel>
-</para>
-<para>
-Displays up to the minute news from your favorite websites.
-</para>
-<para>
-<inlinemediaobject><imageobject><imagedata fileref="figures/full-3" format="png"></imageobject></inlinemediaobject> <guilabel>Mail Summary</guilabel>
-</para>
-<para>
-Shows you how many email messages you have in your selected folders, waiting to be read.
-</para>
-<para>
-<inlinemediaobject><imageobject><imagedata fileref="figures/full-4" format="png"></imageobject></inlinemediaobject> <guilabel>Calendar Summary</guilabel>
-</para>
-<para>
-Shows you your calendar.
-</para>
-<para>
-<inlinemediaobject><imageobject><imagedata fileref="figures/full-5" format="png"></imageobject></inlinemediaobject> <guilabel>Tasks</guilabel>
-</para>
-<para>
-Shows your pending tasks
-</para>
-
-
-      <para>
-        To add additional services to your Summary, or to edit the
-        existing services, select
-        <menuchoice>
-	  <guimenu>Tools</guimenu> 
-	  <guimenuitem>Summary Settings</guimenuitem> 
-	</menuchoice>.
-      </para>
-
-    </sect2>
-
-    <sect2 id="basics-mail">
-      <title>Introducing Email</title>
-      <para>
-         <application>Ximian Evolution</application> email is like other
-         email programs in several ways:
-     <itemizedlist>
-	  <listitem>
-	    <para>
-              It can sort and organize your mail in a wide variety of
-              ways with folders, searches, and filters.
-           </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-              It can send and receive mail in HTML or as plain text,
-              and makes it easy to send and recieve multiple file
-              attachments.
-           </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-              It supports multiple mail sources, including <glossterm
-              linkend="imap">IMAP</glossterm>, <glossterm
-              linkend="pop">POP3</glossterm>, local
-              <filename>mbox</filename> and <filename>mh</filename>
-              spools and files created by other mail programs.
-
-<!-- NOT FOR 1.0, but maybe later 
-              and even NNTP messages (newsgroups), which aren't
-              technically email.
--->
-            </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      It lets you guard your privacy with encryption.
-	    </para>
-	  </listitem>
-	</itemizedlist>
-      </para>
-      <para>
-        However, <application>Ximian Evolution</application> has some
-        important differences.  First, it's built to handle very large
-        amounts of mail.  Both the <link
-        linkend="usage-mail-organize-filters">filtering</link> and
-        <link linkend="usage-mail-organize-search">searching</link>
-        functions were built for speed and efficiency on large volumes
-        of mail. There's also the <application>Ximian Evolution</application>
-        <link linkend="usage-mail-organize-vFolders">vFolder</link>,
-        an advanced organizational feature not found in mainstream
-        mail clients.  If you get a lot of mail, or if you keep every
-        message you get in case you need to refer to it later, you'll
-        find this feature especially useful.
-     </para>
-     <para>
-        Here's what the mailer looks like:
-
- <!-- ==============Figure=================================== -->
-
-      <figure id="usage-mail-intro-fig">
-          <title>Ximian Evolution Mail</title>
-          <screenshot>
-            <screeninfo>Inbox</screeninfo>
-            <mediaobject><imageobject><imagedata  fileref="figures/mail-inbox" format="png" srccredit="Kevin Breit">
-        </imageobject></mediaobject>
-        </screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-</para>
-      <para>
-        <inlinemediaobject><imageobject><imagedata  fileref="figures/full-1"
-        format="png"></imageobject></inlinemediaobject> <guilabel>Email
-        Viewer</guilabel>
-      </para>
-    
-      <para>
-        This is where your email is displayed.
-      </para>
-
-      <para>
-        <inlinemediaobject><imageobject><imagedata  fileref="figures/full-2"
-        format="png"></imageobject></inlinemediaobject> <guilabel>Message List</guilabel>
-      </para>
-    
-      <para>
-        The <guilabel>Message List</guilabel> displays all the emails
-        that you have.  This includes all your read, unread, and email
-        that is flagged to be deleted.
-      </para>
-
-      <para>
-     If you find the <interface>view pane</interface> too small, you can resize
-        the pane, enlarge the whole window, or double-click on the
-        message in the <interface>message list</interface> to have it
-        open in a new window.  To change the sizes of a pane, just click
-        and hold on the divider between the two panes.  Then you can drag
-        up and down to select the size of the panes.
-
-</para>
-<para> Just like with folders, you can right-click on messages in the
-        message list and get a menu of possible actions: you can move,
-        delete, or undelete them, and create filters or vFolders based
-        on them.
-      </para>
-      <para>
-        Most of the mail-related actions you'll want to perform are
-        listed in the <guimenu>Message</guimenu> menu in the menu bar.
-        The most frequently used ones, like
-        <guimenuitem>Reply</guimenuitem> and
-        <guimenuitem>Forward</guimenuitem>, also appear as buttons in
-        the toolbar. Almost all of them are also located in the
-        right-click menu and as keyboard shortcuts, which tend to be
-        faster once you get the hang of them.  You can choose
-        whichever way you like best; the idea is that the software
-        should work the way you want, rather than making you work the
-        way the it does.
-      </para>
-
-       <para>
-         For an in-depth guide to the email capabilities of Ximian
-         Evolution, read <xref linkend="usage-mail">.
-      </para>
-    </sect2>
-    <sect2 id="basics-calendar">
-      <title>Introducing the Calendar</title>
-      <para>
-       To begin using the calendar, select
-       <guibutton>Calendar</guibutton> from the <interface>shortcut
-       bar</interface>.  By default, the calendar starts showing
-       today's schedule on a ruled background.  At the upper right,
-       there's a monthly calendar you can use to switch days.  Below
-       that, there's a <guilabel>Task</guilabel> pad, where you can
-       keep a list of tasks separate from your calendar appointments.
-       The day view in the calendar looks like this:
-
-   <!-- ============== Figure ============================= -->
-    <figure id="usage-calendar-fig">
-      <title>Ximian Evolution Calendar View</title>
-      <screenshot>
-	<screeninfo>Ximian Evolution Contact Manager Window</screeninfo>
-	<mediaobject><imageobject><imagedata  fileref="figures/calendar" format="png" srccredit="Aaron Weber">
-	</imageobject></mediaobject>
-      </screenshot>
-    </figure>
-  <!-- ============== End of Figure ============================= --> 
-
-    </para>
-
-      <para>
-        <inlinemediaobject><imageobject><imagedata  fileref="figures/full-1"
-        format="png"></imageobject></inlinemediaobject> <guilabel>Appointment
-        List</guilabel>
-      </para>
-  
-      <para>
-	The <guilabel>Appointment List</guilabel> is responsible for showing you all of
-	your scheduled appointments, whether they are all day appointments or simply one time
-	appointments that last a half an hour.
-      </para>
-
-      <para>
-	<inlinemediaobject><imageobject><imagedata  fileref="figures/full-2" format="png"></imageobject></inlinemediaobject>
-	<guilabel>Task List</guilabel>
-      </para>
-
-      <para>
-        The <guilabel>Task List</guilabel> compliments the
-        <guilabel>Appointment List </guilabel> as it keeps track of
-        tasks which don't have a time associated with them. Tasks can
-        have complex notes associated with them, and you can also note
-        their completeness on a percentage scale.
-      </para>
-
-      <para>
-	<inlinemediaobject><imageobject><imagedata  fileref="figures/full-3" format="png"></imageobject></inlinemediaobject>
-	<guilabel>Calendar Window</guilabel>
-      </para>
-
-      <para>
-	The <guilabel>Calendar Window</guilabel> has a graphical representation of
-	the calendar, so you can select what days to view in the <guilabel>Appointment
-	List</guilabel>.
-      </para>
-
-      <para>
-          For more information about the calendar
-          read <xref linkend="usage-calendar">.
-      </para>
-
-    </sect2>
-    <sect2 id="basics-contacts">
-      <title>Introducing the Address Book</title>
-      <para>
-        The <application>Ximian Evolution</application> address book
-        can handle all of the functions of an address book, phone
-        book, or Rolodex.  Of course, it's a lot easier to update
-        <application>Ximian Evolution</application> than it is to
-        change an actual paper book. <application>Ximian
-        Evolution</application> also allows easy synchronization with
-        hand-held devices and functions with <glossterm
-        linkend="ldap">LDAP</glossterm> directories on a network.
-      </para>
-      <para>
-        Another advantage of the <application>Ximian Evolution</application>
-        address book is its integration with the rest of the
-        application.  For example, you can create an address card from
-        an email just by right-clicking on the sender's email address.
-      </para>
-      <para>
-        To open your address book, click on
-        <guibutton>Contacts</guibutton> in the shortcut bar, or select
-        one of your contacts folders from the folder bar.  <xref
-        linkend="usage-contact-fig"> shows the address book in all its
-        organizational glory.  By default, the address book shows all
-        your cards in alphabetical order, in a <glossterm
-        linkend="minicard">minicard</glossterm> view.  You can select
-        other views from the <guimenu>View</guimenu> menu, and adjust
-        the width of the columns by clicking and dragging the grey
-        column dividers.
-      </para>
-      <para>
-        The address book looks like this:
-
-      <figure id="usage-contact-fig">
-	<title>Ximian Evolution Contact Interface</title>
-	<screenshot>
-	  <screeninfo>Ximian Evolution Contact List Window</screeninfo>
-	  <mediaobject><imageobject><imagedata  fileref="figures/contact" format="png" srccredit="Kevin Breit">
-  	  </imageobject></mediaobject>
-	</screenshot>
-      </figure>
-     </para>
-      <para>
-        <inlinemediaobject><imageobject><imagedata  fileref="figures/full-1"
-        format="png"></imageobject></inlinemediaobject> <guilabel>Contact
-        List</guilabel>
-      </para>
-      <para>
-        The <guilabel>Contact List</guilabel> lists your contacts.
-      </para>
-      <para>
-          For detailed instructions on how to use the address book,
-          read <xref linkend="usage-contact">.
-      </para>
-    </sect2>
-  </sect1>
-</chapter>
\ No newline at end of file
diff --git a/help/no/usage-notes.sgml b/help/no/usage-notes.sgml
deleted file mode 100644
index 1ff2283128..0000000000
--- a/help/no/usage-notes.sgml
+++ /dev/null
@@ -1,49 +0,0 @@
-<chapter id="usage-notes">
-  <title>Evolution Notes</title>
-  <abstract>
-    <title> An Overview of the Evolution Notes</title>
-    <para>
-      In the dark ages before email was invented, there were little
-      scraps of people which people used for short-term information
-      storage.  These scraps of paper were called notes.  Now, notes
-      are an almost necessary part of our lives, albeit in electronic
-      form.  It only makes sense, then, that
-      <application>Evolution</application> will eventually have a
-      Notes feature.  <application>Evolution</application> can help
-      you take notes in the following ways:
-     <itemizedlist>
-       <listitem>
-         <para>
-           Take down phone numbers, take school notes, take phone
-	   messages, or even write poetry.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Color code notes to organize them, or just to
-           make them look good.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Turn a note into an email or a text file.
-         </para>
-       </listitem>
-       <listitem>
-         <para>
-           Write <glossterm>Haiku</glossterm>
-         </para>
-       </listitem>
-     </itemizedlist>
-   </para>
-   <para>
-     You can start writing notes by clicking
-     <guibutton>Notes</guibutton> in the shortcut bar.  Of course,
-     it's not there yet. But when it is, it'll take you to the
-     notepad.
-   </para>
-  </abstract>
-</chapter>
-
-
-
diff --git a/help/no/usage-print.sgml b/help/no/usage-print.sgml
deleted file mode 100644
index e611b97b00..0000000000
--- a/help/no/usage-print.sgml
+++ /dev/null
@@ -1,115 +0,0 @@
-<chapter id="usage-print">
-<title>Printing with Evolution</title>
-<para>
-  Like most GNOME applications, <application>Evolution</application> uses
-  the gnome-print system, so if you've used any other GNOME
-  application to print, you should be able to print from
-  <application>Evolution</application> immediately.
-</para>
-<para>
-  Whether you're printing a message, a calendar page, or a selection
-  of address cards, you can choose to print directly to a printer, or
-  save the print output to a postscript file.  You can also use the
-  preview feature to see how your printed output will look.
-</para>
-
-
-  <sect1 id="printpreview">
-    <title>Print Preview</title>
-    <para>
-      <guibutton>Print Preview</guibutton> appears both as a button in
-      the printing dialog and as an item in the
-      <guimenu>File</guimenu> menu.  In both places, it does the same
-      thing: it opens a new window that shows you what would happen if
-      you were to print the current message, calendar, appointment, or
-      address card.
-    </para>
-    <para>
-      That window allows you to select which pages you want to see,
-      and how close you'd like to look at them.  Zoom in or out, fit
-      the page to the window (the <guibutton>Fit</guibutton> button)
-      or match the width of the page and the window (the
-      <guibutton>Fit Width</guibutton> button).  None of these buttons
-      changes the way the page will be printed, but they do let you
-      get a better look.  If you're satisfied with the way the things
-      look, click <guibutton>Print</guibutton> to send your document
-      on its way.  If you'd like to change it, just close the
-      <guilabel>Print Preview</guilabel> window and make the changes
-      you want from your mail, calendar, or addressbook.
-    </para>
-
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="print-preview">
-	  <title>Print Preview</title>
-	  <screenshot>
-	    <screeninfo>Print Preview</screeninfo>
-	    <mediaobject><imageobject><imagedata fileref="figures/print-preview" format="png" srccredit="Aaron Weber">
-	</imageobject></mediaobject>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-  </sect1>
-
-  <sect1 id="print-destination">
-    <title>File or Printer?</title>
-    <para>
-       The printer selection window, shown in <xref
-       linkend="print-dest">, lets you choose the format for
-       printing&mdash; <guilabel>Generic Postscript</guilabel>,
-       whether to write to a PDF file, and whether to print to a file
-       or to an actual printer in Generic Postscript.  If you choose a
-       printer, you'll be asked for the printer command (probably
-       <guilabel>lpr</guilabel>) which your system uses.  If you
-       choose to print to a file, you'll need to decide upon a
-       filename.  And of course, you'll want to choose a number of
-       copies, and whether to collate them.
-
-	<note id="windows-ps">
-	  <title>Printing to PostScript?</title>
-	  <para>
-           PostScript is the file format used by most laser printers,
-           and in UNIX world is the easiest way to print to a file.
-           However, most systems running Microsoft Windows can't
-           recognize or handle PostScript files.  You'll need to print
-           to PDF if you want to share your file with Windows users.
-	  </para>
-	</note>
-    </para>
-
- <!-- ==============Figure=================================== -->
- 
-      <figure id="print-dest">
-	  <title>Choosing a Printer</title>
-	  <screenshot>
-	    <screeninfo>Choosing a Printer</screeninfo>
-	    <mediaobject><imageobject><imagedata fileref="figures/print-dest" format="png" srccredit="Aaron Weber">
-	</imageobject></mediaobject>
-	</screenshot>
-      </figure>
-<!-- ==============End of Figure============================== -->
-
-   <para>
-     If you're printing a message that's more than one page, you'll
-     have the option of choosing which pages to print.  If you're
-     printing a calendar entry, you can decide what range of dates to
-     print.  And, if you're printing contact cards, you can decide
-     whether to print only the selected cards, or all of them.
-   </para>
-    <para>
-      When you're ready, click <guibutton>Print</guibutton> to print,
-      <guibutton>Preview</guibutton> to have a look (or another look)
-      at the preview, or <guibutton>Cancel</guibutton> to cancel the
-      whole deal.
-    </para>
-  </sect1>
-</chapter>
-
-
-
-
-
-
-
diff --git a/help/no/usage-sync.sgml b/help/no/usage-sync.sgml
deleted file mode 100644
index 5b93a65736..0000000000
--- a/help/no/usage-sync.sgml
+++ /dev/null
@@ -1,39 +0,0 @@
-    <chapter id="usage-sync">
-      <title>Synchronizing Evolution with Hand-Held Devices</title>
-      <para>
-        This chapter is very short.  It describes how to synchronize
-        the data on your Palm-OS device with the data you store in
-        <application>Ximian Evolution</application>.  If you need
-        information on how to set up handheld synchronization, consult
-        <xref linkend="config-sync">.
-      </para>
-
-      <sect1 id="hotsync">
-        <title>Using HotSync</title>
-        <para>
-          Put your hand-held device in its cradle and press the
-          HotSync button.
-        </para>
-
-<tip id="sync-tip">
-<title>Palm OS v. 4.0 with Passwords</title>
-<para>
-If you use Palm OS v. 4.0 and have password protection turned on for
-your handheld device, you may encounter trouble synchronizing.  If
-this happens, try turning off password protection on your handheld,
-synchronize it with your desktop computer, and then re-enable password
-protection on your handheld.
-</para>
-</tip>
-        <para>
-	 If you have followed the set up instructions properly, your
-	 Palm-OS device will synchronize data with <application>Ximian
-	 Evolution</application>.
-        </para>
-
-         <para>
-            That's it.
-         </para>
-
-       </sect1>
-    </chapter>
diff --git a/help/omf.make b/help/omf.make
deleted file mode 100644
index 3261e00158..0000000000
--- a/help/omf.make
+++ /dev/null
@@ -1,53 +0,0 @@
-# 
-# No modifications of this Makefile should be necessary.
-#
-# This file contains the build instructions for installing OMF files.  It is
-# generally called from the makefiles for particular formats of documentation.
-#
-# Note that you must configure your package with --localstatedir=/var/lib
-# so that the scrollkeeper-update command below will update the database
-# in the standard scrollkeeper directory.
-#
-# If it is impossible to configure with --localstatedir=/var/lib, then
-# modify the definition of scrollkeeper_localstate_dir so that
-# it points to the correct location. Note that you must still use 
-# $(localstatedir) in this or when people build RPMs it will update
-# the real database on their system instead of the one under RPM_BUILD_ROOT.
-#
-# Note: This make file is not incorporated into xmldocs.make because, in
-#       general, there will be other documents install besides XML documents
-#       and the makefiles for these formats should also include this file.
-#
-# About this file:
-#	This file was taken from scrollkeeper_example2, a package illustrating
-#	how to install documentation and OMF files for use with ScrollKeeper
-#	0.3.x and 0.4.x.  For more information, see:
-#		http://scrollkeeper.sourceforge.net/	
-# 	Version: 0.1.2 (last updated: March 20, 2002)
-#
-
-omf_dest_dir=$(datadir)/omf/@PACKAGE@
-scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
-
-omf: omf_timestamp
-
-omf_timestamp: $(omffile)
-	-for file in $(omffile); do \
-	  scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
-	done
-	touch omf_timestamp
-
-install-data-hook-omf:
-	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
-	for file in $(omffile); do \
-		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-	done
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
-
-uninstall-local-omf:
-	-for file in $(srcdir)/*.omf; do \
-		basefile=`basename $$file`; \
-		rm -f $(omf_dest_dir)/$$basefile; \
-	done
-	-rmdir $(omf_dest_dir)
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
diff --git a/help/update_po.pl b/help/update_po.pl
deleted file mode 100755
index 7fa054e721..0000000000
--- a/help/update_po.pl
+++ /dev/null
@@ -1,212 +0,0 @@
-#!/usr/bin/perl -w 
-#
-#  Script for translators that extract .sgml files into .sgml.po ones
-#
-#  Copyright (C) 2001 Héctor García Álvarez.
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License as
-#  published by the Free Software Foundation; either version 2 of the
-#  License, or (at your option) any later version.
-#
-#  This script 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 GNU
-#  General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this library; if not, write to the Free Software
-#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-#
-#  Authors: Héctor García Álvarez <hector@scouts-es.org>
-
-## Loaded modules
-use strict; 
-use File::Basename;
-use Getopt::Long;
-
-my $LANG = $ARGV[0];
-#my $OUTFILE = "./tmp/$FILE.h";
-
-my %string = ();
-my @elements;
-my @items;
-my $n=0;
-
-if (! $LANG){
-        print "Usage: update_po.pl LANGCODE\n";
-	exit;
-} else { $LANG .=".po"; }
-
-if ( !(-d "./$LANG") ){ mkdir ("./$LANG", 0755) ; }
-
-chdir ("./C");
-if ( !(-d "./tmp") ) { mkdir ("./tmp", 0755) ; }
-
-my $comand="";
-
-open FILES, "<POTFILES.in" ;
-#open POTFILE, ">POTFILES.in.h"; 
-while (<FILES>) {
-	undef (%string);
-        s/\n//g;
-	my $Original_file = $_ ;
-	s/.\///g;
-	my $Converted_file = "./tmp/".$_.".h";
-	#       print $Original_file."\n";
-	#       print $Translated_file."\n";
-	print "Converting ".$Original_file."\n" ;
-	system "rm -f $Converted_file";
-	&Convert ($Original_file);
-	open OUT, ">>$Converted_file";
-	&addMessages;
-	close OUT;
-	$comand = "xgettext --default-domain=$Original_file ";
-	$comand .="--directory=. --add-comments --keyword=_ --keyword=N_ ";
-	$comand .="$Converted_file ";
-	system ( $comand );
-	print ("Updating $Original_file.po\n");
-	system ("mv $Original_file.po ../$LANG/$Original_file.pot");
-
-	if ( -f "../$LANG/$Original_file.po") {
-		system ("cp ../$LANG/$Original_file.po ../$LANG/$Original_file.po.old");
-		system ("msgmerge ../$LANG/$Original_file.po.old ../$LANG/$Original_file.pot -o ../$LANG/$Original_file.po");
-	} else {
-		system ("mv ../$LANG/$Original_file.pot ../$LANG/$Original_file.po");
-	}
-	
-	system ("msgfmt --statistics ../$LANG/$Original_file.po");
-	system ("rm -f ../$LANG/$Original_file.pot");
-#	print POTFILE $Converted_file."\n";
-	print ".\n";
-}
-close FILES;
-
-system ("rm -rf ./tmp ");
-exit 0;
-
-
-sub Convert() {
-
-    ## Reading the file
-  open (IN, "<$_[0]") || die "can't open $_[0]: $!";
- 
-        ### For translatable Sgml files ###
-  while (<IN>) {
-  	if ( /<!--/ ) {
-		my $Salida =  $_ ;
-		if ( (/-->/) ) {
-			$string{$Salida} = [];
-		} else {
-			while (<IN>) {
-				$Salida .=  $_ ;
-				if ( /-->/ ) { last ; }
-			}
-			$string{$Salida} = [];
-		}
-	}
-	elsif ( /<para>/ ) {
-		my $number_of_para = 1;
-		my $Salida =  $_ ;
-		if ( /<\/para>/ ) {
-			$string{$Salida} = [];
-		} else {
-			while (<IN>) {
-				if ( /<para>/ ) { $number_of_para++; }
-				$Salida .=  $_ ;
-				if ( /<\/para>/ ) { 
-					$number_of_para--;
-					if ( $number_of_para==0) {last ; }
-				}
-			}
-			$string{$Salida} = [];
-		}
-	}
-        elsif ( /<title>/ ) {
-		my $Salida =  $_ ;
-		if ( /<\/title>/ ) {
-			$string{$Salida} = [];
-		} else {
-			while (<IN>) {
-				$Salida .=  $_ ;
-				if ( /<\/title>/ ) { last ; }
-			}
-			$string{$Salida} = [];
-		}
-	}
-	elsif ( /<glossterm>/ ) {
-		my $Salida =  $_ ;
-		if ( /<\/glossterm>/ ) {
-			$string{$Salida} = [];
-		} else {
-			while (<IN>) {
-				$Salida .=  $_ ;
-				if ( /<\/glossterm>/ ) { last ; }
-			}
-			$string{$Salida} = [];
-		}
-	}
-	elsif ( /<guilabel>/ ) {
-		my $Salida =  $_ ;
-		if ( /<\/guilabel>/ ) {
-			$string{$Salida} = [];
-		} else {
-			while (<IN>) {
-				$Salida .=  $_ ;
-				if ( /<\/guilabel>/ ) { last ; }
-			}
-			$string{$Salida} = [];
-		}
-	}
-  }
-  close (IN);
-}
-
-sub addMessages{
-
-    foreach my $theMessage (sort keys %string) { 
-    
-    my ($tag) = $string{$theMessage} ;
-
-    # Replace XML codes for special chars to
-    # geniune gettext syntax
-    #---------------------------------------
-    $theMessage =~ s/"/\\"/mg;
-    $theMessage =~ s/\n/\\n\n/mg;
-    
-#    $theMessage =~ s/&lt;/</mg;
-#    $theMessage =~ s/&gt;/>/mg;
-
-    if ($theMessage =~ /\n/) {
-        #if ($tag) { print OUT "/* $tag */\n"; } 
-        @elements =  split (/\n/, $theMessage);
-        for ($n = 0; $n < @elements; $n++) {
-           
-           if ($n == 0) {
-	       print OUT "gchar *s = N_"; 
-               print OUT "(\"$elements[$n]\"";
-	       if ($n == @elements - 1) { print OUT ");\n"; }
-	       print OUT "\n"; 
-           }
-
-           elsif ($n == @elements - 1) { 
-	       print OUT "             ";
-               print OUT "\"$elements[$n]\");\n\n";
-           }
-
-           elsif ($n > 0)  { 	
-	       print OUT "             ";
-               print OUT "\"$elements[$n]\"\n";
-           }
-        }
-
-    } else {
-    	
-#	if ($tag) { print OUT "/* $tag */\n"; }		
-	print OUT "gchar *s = N_(\"$theMessage\");\n";
-    }
-	    
-    }
-}
-
diff --git a/help/update_translation.pl b/help/update_translation.pl
deleted file mode 100755
index 0023b069d1..0000000000
--- a/help/update_translation.pl
+++ /dev/null
@@ -1,240 +0,0 @@
-#!/usr/bin/perl -w 
-#
-#  Script that translates .sgml files using the .po files generated from
-#  the script update_po.pl
-#
-#  Copyright (C) 2001 Héctor García Álvarez.
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU General Public License as
-#  published by the Free Software Foundation; either version 2 of the
-#  License, or (at your option) any later version.
-#
-#  This script 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 GNU
-#  General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this library; if not, write to the Free Software
-#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-#
-#  Authors: Héctor García Álvarez <hector@scouts-es.org>
-
-## Loaded modules
-use File::Basename;
-use Getopt::Long;
-
-my $LANG = $ARGV[0];
-
-my %string;
-my $texto_original="";
-my $texto_traducido="";
-
-if (! $LANG){
-    print "Usage: update_translation.pl LANGCODE\n";
-    exit;
-}
-
-chdir ("./C");
-
-## Reading the po file
-#print "Loading ".$LANG.".po\n";
-#&load_translated_strings ($LANG.".po");
-
-## Checking for the lang dir
-if ( !(-d "../".$LANG) ) { mkdir ("../".$LANG, 0755) ; }
-
-open FILES, "<POTFILES.in" ;
-while (<FILES>) {
-	undef %string;
-	s/\n//g;
-	$Original_file = $_ ;
-	s/.\///g;
-	$Translated_file = "../".$LANG."/".$_;
-#	print $Original_file."\n";
-#	print $Translated_file."\n";
-	&load_translated_strings ("../".$LANG.".po/".$_.".po");
-	print "Translating ".$Original_file ;
-	system "rm -f $Translated_file";
-	&translate_file ($Translated_file , $Original_file);
-	print ".\n";
-}
-close FILES;							    
-
-exit 0;
-
-
-
-
-sub load_translated_strings () 
-{
-	my $FILE=$_[0];
-	open (IN, "<$FILE") || die "I can't find $FILE";
-
-	while (<IN>) {
-	        if ( /#: /) {
-			&original;
-			&traduccion;
-#               print "Original \n##".$texto_original."##\n";
-#               print "Traducción \n##".$texto_traducido."##\n";
-	                $string{$texto_original} = $texto_traducido;
-		}
-	}
-	close (IN);
-}
-
-sub translate_file ()
-{
-	my $OUTFILE=$_[0];
-	my $INFILE=$_[1];
-	
-	open OUT, ">>$OUTFILE";
-	open (IN, "<$INFILE") || die "can't open $INFILE: $!";
-
-	while (<IN>) {
-		my $imprimir = 0;
-		if ( /<!--/ ) {
-			$Salida =  $_ ;
-			if ( !(/-->/) ) {
-				while (<IN>) {
-					$Salida .=  $_ ;
-					if ( /-->/ ) { last ; }
-				}
-			}
-			$imprimir = 1;
-		}
-		elsif ( /<para>/ ) {
-			my $number_of_para = 1;
-			$Salida = $_ ;
-			if ( !(/<\/para>/) ) {
-				while (<IN>) {
-					if ( /<para>/ ) { $number_of_para++; }
-					$Salida .=  $_ ;
-					if ( /<\/para>/ ) {
-						$number_of_para--;
-						if ( $number_of_para==0) {last ; }
-					}
-				}
-			}
-			$imprimir = 1;
-		}
-		elsif ( /<title>/ ) {
-			$Salida = $_ ;
-			if ( !(/<\/title>/) ) {
-				while (<IN>) {
-					$Salida .=  $_ ;
-					if ( /<\/title>/ ) { last ; }
-				}
-			}
-			$imprimir = 1;
-		}
-		elsif ( /<glossterm>/ ) {
-			$Salida = $_ ;
-			if ( !(/<\/glossterm>/) ) {
-				while (<IN>) {
-					$Salida .=  $_ ;
-					if ( /<\/glossterm>/ ) { last ; }
-				}
-			}
-			$imprimir = 1;
-		}
-		elsif ( /<guilabel>/ ) {
-			$Salida = $_ ;
-			if ( !(/<\/guilabel>/) ) {
-				while (<IN>) {
-					$Salida .=  $_ ;
-					if ( /<\/guilabel>/ ) { last ; }
-				}
-			}
-			$imprimir = 1;
-		}
-	        if ( $imprimir == 0 ) {  print (OUT $_); }
-		else { 
-			my $impreso=0;
-			foreach my $theMessage (sort keys %string) {
-				if (!($theMessage cmp $Salida)) {
-					my $tag = $string{$Salida} ;
-					
-					if ( $tag cmp "") {
-						$tag =~ s/\\"/"/mg ;
-						print (OUT $tag);
-					}
-					else {
-						print (OUT $Salida);
-					}
-					$impreso=1;
-				}
-			}
-			if ( $impreso == 0) {
-				print "No lo encuentro\n##".$Salida."##\n";
-				$impreso=0;
-			} 
-			$imprimir = 0;
-		}
-	}
-	close IN;
-	close OUT;
-}
-#exit 0;
-
-sub original () 
-{
-	my $tmp = "";
-	while (<IN>) {
-		if ( !(/^#: /) ) {
-			if ( /msgid ""/) { s/msgid ""\n//; }
-			if ( /msgstr/) {
-				$tmp =~ s/\\n/\n/sg ;
-				$tmp =~ s/\\t/\t/sg ;
-				$tmp =~ s/\\"/"/sg ;
-				$texto_original = $tmp;
-				last ;
-			}
-			s/msgid "//;
-			s/\s*"// ;
-			s/"\n// ;
-			s/\n// ;
-			$tmp .=  $_;
-		}
-	}
-}
-		
-sub traduccion ()
-{
-        my $tmp = "";
-	my $first = 0;
-	if ( /msgstr "/) {
-		if ( /msgstr ""/) {
-			$tmp = "";
-			$first = 1;
-		} else {
-			$tmp = $_;
-			$tmp =~ s/msgstr "//;
-			$tmp =~ s/"\n// ;
-		}
-	}
-	while (<IN>) {
-	
-		if ( !($_ cmp "\n") )  {
-			$tmp =~ s/\\n/\n/sg ;
-			$tmp =~ s/\\t/\t/sg ;
-			$tmp =~ s/\"/"/sg ;
-			if ( $first == 1 ) { $texto_traducido = "" ; }
-			else { $texto_traducido = $tmp; }
-			last ;
-		}
-		$first = 0;
-		s/msgstr "//;
-		s/"\n// ;
-		s/\s*"// ;
-		$tmp .=  $_;	
-	}
-	if ( eof IN ) {
-		$tmp =~ s/\\n/\n/sg ;
-		$tmp =~ s/\\t/\t/sg ;
-		$tmp =~ s/\"/"/sg ;
-		$texto_traducido = $tmp; 
-	}
-}
diff --git a/help/xmldocs.make b/help/xmldocs.make
deleted file mode 100644
index ad65ccf9f4..0000000000
--- a/help/xmldocs.make
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# No modifications of this Makefile should be necessary.
-#
-# To use this template:
-#     1) Define: figdir, docname, lang, omffile, and entities in
-#        your Makefile.am file for each document directory,
-#        although figdir, omffile, and entities may be empty
-#     2) Make sure the Makefile in (1) also includes 
-#	 "include $(top_srcdir)/xmldocs.make" and
-#	 "dist-hook: app-dist-hook".
-#     3) Optionally define 'entities' to hold xml entities which
-#        you would also like installed
-#     4) Figures must go under $(figdir)/ and be in PNG format
-#     5) You should only have one document per directory 
-#     6) Note that the figure directory, $(figdir)/, should not have its
-#        own Makefile since this Makefile installs those figures.
-#
-# example Makefile.am:
-#   figdir = figures
-#   docname = scrollkeeper-manual
-#   lang = C
-#   omffile=scrollkeeper-manual-C.omf
-#   entities = fdl.xml
-#   include $(top_srcdir)/xmldocs.make
-#   dist-hook: app-dist-hook
-#
-# About this file:
-#	This file was taken from scrollkeeper_example2, a package illustrating
-#	how to install documentation and OMF files for use with ScrollKeeper 
-#	0.3.x and 0.4.x.  For more information, see:
-#		http://scrollkeeper.sourceforge.net/
-#	Version: 0.1.2 (last updated: March 20, 2002)
-#
-
-
-# ************* Begin of section some packagers may need to modify  **************
-# This variable (docdir) specifies where the documents should be installed.
-# This default value should work for most packages.
-# docdir = $(datadir)/@PACKAGE@/doc/$(docname)/$(lang)
-docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-
-# **************  You should not have to edit below this line  *******************
-xml_files = $(entities) $(docname).xml
-
-EXTRA_DIST = $(xml_files) $(omffile)
-CLEANFILES = omf_timestamp
-
-# If the following file is in a subdir (like help/) you need to add that to the path
-include $(top_srcdir)/help/omf.make
-
-all: omf
-
-$(docname).xml: $(entities)
-	-ourdir=`pwd`;  \
-	cd $(srcdir);   \
-	cp $(entities) $$ourdir
-
-app-dist-hook:
-	if test "$(figdir)"; then \
-	  $(mkinstalldirs) $(distdir)/$(figdir); \
-	  for file in $(srcdir)/$(figdir)/*.png; do \
-	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
-	    $(INSTALL_DATA) $$file $(distdir)/$(figdir)/$$basefile; \
-	  done \
-	fi
-
-install-data-local: omf
-	$(mkinstalldirs) $(DESTDIR)$(docdir)
-	for file in $(xml_files); do \
-	  cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
-	done
-	if test "$(figdir)"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \
-	  for file in $(srcdir)/$(figdir)/*.png; do \
-	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
-	  done \
-	fi
-
-install-data-hook: install-data-hook-omf
-
-uninstall-local: uninstall-local-doc uninstall-local-omf
-
-uninstall-local-doc:
-	-if test "$(figdir)"; then \
-	  for file in $(srcdir)/$(figdir)/*.png; do \
-	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
-	    rm -f $(docdir)/$(figdir)/$$basefile; \
-	  done; \
-	  rmdir $(DESTDIR)$(docdir)/$(figdir); \
-	fi
-	-for file in $(xml_files); do \
-	  rm -f $(DESTDIR)$(docdir)/$$file; \
-	done
-	-rmdir $(DESTDIR)$(docdir)
-