17 files changed, 1152 insertions, 824 deletions

diff --git a/help/no/apx-authors.sgml b/help/no/apx-authors.sgml
index 37497ae176..a48a8c30ff 100644
--- a/help/no/apx-authors.sgml
+++ b/help/no/apx-authors.sgml
@@ -7,19 +7,25 @@
      <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>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>Nat Friedman: <email>nat@ximian.com</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>
@@ -38,10 +44,18 @@ og andre dedikerte GNOME-programmerere.
        som har arbeidet på disse prosjektene.
     </para>
 
-   <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/apps/evolution.php3"
+      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-
@@ -51,6 +65,7 @@ og andre dedikerte GNOME-programmerere.
       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
@@ -58,12 +73,11 @@ og andre dedikerte GNOME-programmerere.
       (<email>duncan@ximian.com</email>) og Ettore Perazzoli
       (<email>ettore@ximian.com</email>) med hjelp fra 
       applikasjonsprogrammererene og GNOME Documentation Project.
-      Vennligst send alle kommentarer og forslag angående brukerhåndboken
-      til GNOME Documentation Project på
-      <email>docs@gnome.org</email>. Du kan også legge til dine kommentarer
-      på nett ved å bruke <ulink type="http"
-      url="http://www.gnome.org/gdp/doctable/">GNOME Documentation
-      Status Table</ulink>.
+      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: 
diff --git a/help/no/apx-bugs.sgml b/help/no/apx-bugs.sgml
index 3ef159ce5b..aae4fde936 100644
--- a/help/no/apx-bugs.sgml
+++ b/help/no/apx-bugs.sgml
@@ -3,21 +3,36 @@
     <title>Kjente feil og begrensninger</title>
     <abstract>
     <para>
-     Dette tillegget beskriver kjente feil og begrensninger i
-    <application>Evolution</application>.  Vennligst bruk GNOME
-    <application>Bug Report Tool</application> (kjent som
+     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
-    vi ikke har listet.
+    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>
-      Evolution er fremdeles beta programvare, så feilsøking bør helst
-      overlates til bugzilla-systemet og til programmererene. Uansett,
-      der er en rekke begrensninger som ikke vil bli adressert før
-      versjon 1.0. De mest merkbare er: Import av Microsoft Outlook
-      .pst filer, og kompatibilitet med Microsoft
-      Exchange protokollen.
+      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
index 84f6b3cfb4..e81f906ce3 100644
--- a/help/no/apx-gloss.sgml
+++ b/help/no/apx-gloss.sgml
@@ -1,296 +1,294 @@
 <glossary id="apx-gloss">
 
- <title>Glossary</title>
+ <title>Ordliste</title>
 
  <glossentry id="attachment">
-  <glossterm>Attachment</glossterm>
+  <glossterm>Vedlegg:</glossterm>
   <glossdef>
    <para>
-    Any file sent along with an email.  Attachments may be embedded in
-    a message or appended to it.
+    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>Automatic Indexing</glossterm>
+  <glossterm>Automatsk indeksering:</glossterm>
   <glossdef>
    <para>
-     Pre-sorting procedure that allows
-     <application>Evolution</application> to refer to data quickly.
-     It enables faster searches and decreases memory usage for
-     data displays.
+     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>
+  <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.
+    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>
+  <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.
+    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>
+  <glossterm>Conduit:</glossterm>
   <glossdef>
    <para>
-     A synchronization conduit is a small application which controls
-     the transfer of data between a handheld device and a desktop
-     computer.
+     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>Druid</glossterm>
+  <glossterm>Druide:</glossterm>
   <glossdef>
    <para>
-    A tool which guides a user through a series of steps, usually to
-    configure or set up a program.  Equivalent to "Assistant" and
-    "Wizard."
+    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>
+  <glossterm>Evolution:</glossterm>
   <glossdef>
    <para>
-    <application>Evolution</application> is the <acronym> GNOME
-    </acronym> groupware application.
+    <application>Evolution</application> er <acronym> GNOME's
+    </acronym> gruppevareapplikasjon.
    </para>
   </glossdef>
  </glossentry>
 
  <glossentry id="execute">
-  <glossterm>Execute</glossterm>
+  <glossterm>Kjør:</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.
+    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>Expunge</glossterm>
+  <glossterm>Tøm:</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.
+     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>File Tree</glossterm>
+  <glossterm>Filtre:</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 downwards from the root.  Don't
-     confuse the root directory with the root
-     account, or root's home directory,
-     <filename>/home/root</filename>.b
+     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>
+  <glossterm>Filter:</glossterm>
   <glossdef>
    <para>
-    Within <application>Evolution</application>, a filter is a method
-    of sorting mail automatically.  You can create filters to perform
-    one or more actions on a message that meets any (or all) of a wide
-    range of criteria.
+    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>Forward</glossterm>
+  <glossterm>Videresend:</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. 
+    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>Groupware</glossterm>
+ <glossterm>Gruppevare:</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.
+    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>
+  <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.
+    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>Hot Key</glossterm>
+  <glossterm>Hurtigtast:</glossterm>
   <glossdef>
    <para>
-    Hot-keys are keyboard combinations used to do actions on a
-    computer instead of using the mouse to do the same action.
-    Hot-keys can speed up computer usage.
+    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>
+  <glossterm>iCal:</glossterm>
   <glossdef>
    <para>
-    <application>iCal</application> is the program which
-    <application>Evolution</application> uses to manage the calendar
-    section.
+    <application>iCal</application> er programmet som
+    <application>Evolution</application> bruker for å håndtere kalenderen
    </para>
   </glossdef>
  </glossentry> 
 
  <glossentry id="imap">
-  <glossterm>IMAP</glossterm>
+  <glossterm>IMAP:</glossterm>
   <glossdef>
    <para>
-    Depending upon whom you ask, IMAP stands for the Internet Mail
-    Access Protocol, or the Interim Mail Access Protocol.  Whatever it
-    stands for, 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.
+    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>Inline</glossterm>
+  <glossterm>Innfelt:</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>.
+     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>
+   <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.
+     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>Mail Client</glossterm>
+  <glossterm>E-postklient:</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.
+    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>Minicard</glossterm>
+  <glossterm>Minikort:</glossterm>
   <glossdef>
    <para>
-      A format for the display of contact data.  Similar in appearance
-      to a small business card.
+      Et format for visning av kontaktdata. Likt i utseende til et lite
+      visittkort.
    </para>
   </glossdef>
  </glossentry> 
 
  <glossentry id="nautilus">
-  <glossterm>Nautilus</glossterm>
+  <glossterm>Nautilus:</glossterm>
   <glossdef>
    <para>
-    <application>Nautilus</application> is the next generation file
-    manager for <acronym>GNOME</acronym> being written by Eazel.
+    <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>
+  <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.
+     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>Protocol</glossterm>
+  <glossterm>Protokoll:</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.
+     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>
+  <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.
+     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>
@@ -298,140 +296,124 @@
 
 
  <glossentry id="regular-expression">
-  <glossterm>Regular Expression</glossterm>
+  <glossterm>Vanlig uttrykk:</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[a|u]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.
+      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>Script</glossterm>
+  <glossterm>Skript:</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.
+    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>
+  <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.
+      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>Shortcut Bar</glossterm>
+  <glossterm>Snarveilinje:</glossterm>
   <glossdef>
    <para>
-     A portion of <application>Evolution</application> which offers
-     users fast access to the most frequently used portions of the
-     application.
+     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>Signature</glossterm>
+   <glossterm>Signatur:</glossterm>
    <glossdef>
     <para>
-     In email terms, a signature is a piece of text placed at the end
-     of every email sent, like 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.
+     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>
+   <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
+      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>Tool-Tip</glossterm>
+  <glossterm>Verktøytips:</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.
+      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>
+  <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.
+    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>
+  <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>.
+    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>
+  <glossterm>vFolder:</glossterm>
   <glossdef>
    <para>
-    An email organization tool. vFolders allows you to create a folder
-    that contains the results of a complex search. Folder contents are
-    are updated dynamically.
+    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-prefs.sgml b/help/no/config-prefs.sgml
index 128dc24437..77ebe4e807 100644
--- a/help/no/config-prefs.sgml
+++ b/help/no/config-prefs.sgml
@@ -420,10 +420,10 @@ smtp.omniport.com:143
           To set your calendar preferences, select
           <menuchoice><guimenu>Settings</guimenu>
           <guimenuitem>Calendar
-          Configuration</guimenuitem></menuchoice> from the Calendar
+          Settings</guimenuitem></menuchoice> from the Calendar
           view.  This will open up the
-          <interface>Preferences</interface> window.  It contains three
-          tabs: <guilabel>Calendar</guilabel>, <guilabel>TaskPad</guilabel>, <guilabel>Reminders</guilabel>.  The <interface>calendar
+          <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">.
 
@@ -439,13 +439,21 @@ smtp.omniport.com:143
       <!-- ==============End of Figure================-->
         </para>
 
-    <sect2 id="config-prefs-cal-time">
-      <title>Time Display Settings</title>
+    <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
@@ -455,210 +463,176 @@ smtp.omniport.com:143
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term>Weeks start on</term>
+	    <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>Day range</term>
+	    <term>Start of day</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>
+	      <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-color">
-      <title>Calendar Colors</title>
+    <sect2 id="config-prefs-cal-display">
+      <title>Display</title>
       <para>
-        The <interface>colors tab</interface> allows you to decide
-        what color your calendar will be.  The tab consists of a
-        sample calendar on the right and a list of ten items that can
-        be colored in different ways.  If you click on the color
-        button to the right of each item, you will bring up a
-        color-selector window where you can alter that
-        color.  By clicking <guibutton>OK</guibutton> in the color
-        selection dialog, you can see the results of the color on the
-        sample calendar.
-     </para>
-     <para>The display elements colors you can set are:
+	The <interface>Display</interface> section lets you configure some visual properties of the calendar.
+      </para>
+      <para>The display properties you can set are:
 
-          <itemizedlist>
-           <listitem>
+	<variablelist>
+	  <varlistentry>
+	    <term>Time divisions</term>
+	    <listitem>
               <para>
-                <guilabel>Outline:</guilabel> The lines between days
-                and at the top of the display.
+		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>
 
-           <listitem>
-              <para> <guilabel>Headings:</guilabel> Text color for day
-                and month names and other headings.
+	  <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>
 
-           <listitem>
-              <para> <guilabel>Empty days:</guilabel> This is the
-                background color for any time slots in which you have no appointments.
-               </para>
-            </listitem>  
-
-         <listitem>
-              <para>         
-             <guilabel>Appointments:</guilabel> This is the
-                background color for any time slots in which you have appointments.
-               </para>
+	  <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>
-     
-	  <listitem>
-	    <para> <guilabel>Highlighted day:</guilabel> The
-              background color for a selected time slot.
-             </para>
-	  </listitem>
-
-          
-	  <listitem>
-	    <para>         
-              <guilabel>Day numbers:</guilabel> Text color for date numbers.
-            </para>
-	  </listitem>
-
-              
-	  <listitem>
-	    <para>
-              <guilabel>Current day's number:</guilabel> Text color for today's date.
-             </para>
-	  </listitem>
-
-	  <listitem>
-	    <para> <guilabel>To-Do item that is not yet
-             due:</guilabel> Text color for To-Do list items that are
-             not yet due. 
-	    </para>
-	  </listitem>
-
-
-	  <listitem>
-	    <para> <guilabel>To-Do item that is due today:</guilabel>
-             Text color for today's tasks.
-               </para>
-	  </listitem>
-
-	  <listitem>
-	    <para> <guilabel>To-Do item that is overdue:</guilabel>
-             Text color for overdue tasks.
-               </para>
-	  </listitem>
-
-          </itemizedlist>
-        </para>
+	  </varlistentry>
+	</variablelist>
+      </para>
     </sect2>
 
-    <sect2 id="config-prefs-cal-todo">
-      <title>To Do List Settings</title>
+    <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.  The two areas of the <interface>To Do
-       List</interface> tab offer several options each:
+       way it is displayed.
        <variablelist>
 	 <varlistentry>
-	   <term>Show on To Do List</term>
+	   <term>Tasks due today</term>
 	    <listitem>
 	      <para>
-                This box contains three items.  If you select the
-                check boxes next to them, that information will appear
-                in the To Do list for each task it contains:
-                <itemizedlist>
-                  <listitem>
-		    <para><guilabel>Due Date</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Time Until Due</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Priority</guilabel></para>
-                   </listitem>
-               </itemizedlist>
-               </para>
+		Configures what color to set your tasks that are due today to.
+	      </para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term>Style Options</term>
+	    <term>Overdue tasks</term>
 	    <listitem>
-               <para>
-                 Select among the following checkboxes to determine
-                 how your To Do list will look:
-                <itemizedlist>
-                  <listitem>
-		    <para><guilabel>Highlight overdue items</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Highlight items due today</guilabel></para>
-                   </listitem>
-                  <listitem>
-		    <para><guilabel>Highlight not yet due items</guilabel></para>
-                   </listitem>
-               </itemizedlist>                 
-               </para>
+	      <para>
+		Configures what color to set your overdue items to.
+	      </para>
 	    </listitem>
 	  </varlistentry>
 	</variablelist>
       </para>
     </sect2>
 
-    <sect2 id="config-prefs-cal-alarms">
-      <title>Alarms Settings</title>
-      <para>  
-        The <interface>alarms tab</interface> enables you to select from three boxes:
-        <itemizedlist>
-	  <listitem>
-	    <para><guilabel>Beep on display alarms</guilabel>: select
-	    this box to have <application>Evolution</application> beep
-	    at you for any alarms you have set. These beeps
-	    are distinct from full-fledged audio alarms. If you leave this box
-	    unchecked, <application>Evolution</application> will only
-	    alert you to events by opening a dialog box. 
-           </para>
-	  </listitem>
-	  <listitem>
-	    <para><guilabel>Audio alarms timeout after: </guilabel>
-	    Select this button to have your audio alarms stop
-	    automatically after a certain number of seconds.  </para>
-	  </listitem>
-	  <listitem>
-	    <para><guilabel>Enable snoozing for:</guilabel> If you
-	    would like to have the option to tell
-	    <application>Evolution</application> to repeat an alarm in
-	    a few minutes, select this button and decide how long
-	    you'd like it to wait.
-           </para>
-	  </listitem>
-	</itemizedlist>   
+    <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 Contact Manager</title>
-	<para>
-          To set the behavior of your Contact Manager, click on the
-          <guibutton>Contact Manager</guibutton> tab in the
-          <interface>Preferences</interface> window.
-        </para>
+      <title>Managing the Addressbook</title>
 	<para>
-          You can set the following options: <!--insert variable list
-          here-->
+          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">
@@ -729,7 +703,7 @@ smtp.omniport.com:143
 		  <term>Search scope</term>
 		  <listitem>
 		    <para>
-		      The scope of the search <!-- FIXME: THIS DEFINITION SUCKS -->
+How broad the search is in the directory.
 		    </para>
 		  </listitem>
 		</varlistentry>
@@ -752,7 +726,7 @@ smtp.omniport.com:143
   </sect1>
     
 
-
+<!--
   <sect1 id="config-prefs-general">
     <title>General Preferences</title> 
     <para>
@@ -760,6 +734,7 @@ smtp.omniport.com:143
       they become available.
     </para>
   </sect1>
+-->
 </chapter>
     
 
diff --git a/help/no/config-sync.sgml b/help/no/config-sync.sgml
index 8490f9a84b..c6bd2c684c 100644
--- a/help/no/config-sync.sgml
+++ b/help/no/config-sync.sgml
@@ -1,108 +1,105 @@
   <chapter id="config-sync">
-     <title>Setting up your synchronization system</title> 
+     <title>Oppsett av synkronisering</title> 
      <para>
-        Synchronization presents you with two issues you'll need to
-        address. 
+        Synkronisering presenterer to problemer du må håndtere.
         <simplelist>
           <member>
-            Your computer needs to recognize and access your handheld.
-            At this time, <application>Evolution</application> only
-            supports Palm-OS devices like the PalmPilot and the
-            Handspring Visor.
+            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>
-           You should decide what sort of synchronization behavior you
-           want.
+           Du må bestemme hvilken oppførsel du ønsker for synkroniseringen.
           </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.
+       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>
-        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 labelled <guilabel>EAddress</guilabel>, for the
-        address cards in your Contact Manager,
-        <guilabel>ECalendar</guilabel>, for your Calendar, and
-        <guilabel>ETodo</guilabel>, for your Task List.
+        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>
-      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:
+      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>Disabled</term>
+            <term>Deaktivert:</term>
             <listitem> 
                <para>
-                  Do nothing.
+                  Ikke gjør noe.
                </para>
             </listitem>
           </varlistentry>
 
          <varlistentry>
-            <term>Synchronize</term>
+            <term>Synkroniser:</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.
+                  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>Copy From Pilot</term>
+            <term>Kopier fra pilot:</term>
             <listitem> 
                <para>
-                  If there is any new data on the the handheld device,
-                  copy it to the computer.
+                  Hvis det finnes nye data på den håndholdte enheten,
+                  kopier disse til datamaskinen.
                </para>
             </listitem>
           </varlistentry>
 
          <varlistentry>
-            <term>Copy To Pilot</term>
+            <term>Kopier til pilot:</term>
             <listitem> 
                <para>
-                 Copy new data from the computer to the handheld. 
+                 Kopier nye data fra datamaskinen til den håndholdte. 
                </para>
             </listitem>
           </varlistentry>
 
          <varlistentry>
-            <term>Merge From Pilot</term>
+            <term>Flett fra 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.
+                  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>Merge To Pilot</term>
+            <term>Flett til 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.
+                  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>
@@ -110,24 +107,20 @@
     </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.
+      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>Data Loss Prevention</title> 
+	  <title>Forhindring av datatap</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.
+	    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.sgml b/help/no/evolution.sgml
index 29a6a87141..348c30c3a8 100644
--- a/help/no/evolution.sgml
+++ b/help/no/evolution.sgml
@@ -11,9 +11,7 @@
 <!ENTITY USAGE-PRINT SYSTEM "usage-print.sgml">
 <!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml">
 <!ENTITY CONFIG-SYNC SYSTEM "config-sync.sgml">
-<!ENTITY CONFIG-ENCRYPTION SYSTEM "config-encryption.sgml">
 <!ENTITY MENUREF SYSTEM "menuref.sgml">
-<!ENTITY FAQ SYSTEM "evolution-faq.sgml">
 <!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml">
 <!ENTITY APX-COMMON-TASKS SYSTEM "apx-common-tasks.sgml">
 <!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml">
@@ -44,26 +42,31 @@ implemented. -->
     
   <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. En kopi av
-   lisensen kan finnes <ulink type="help"
-   url="gnome-help:fdl">her</ulink>.  </para>
+   <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>
+     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 0.11 av Evolution brukerhåndboken.
+      Dette er versjon 1.0 av Evolution's brukerhåndbok.
    </releaseinfo>
 
   </bookinfo>
@@ -71,13 +74,13 @@ implemented. -->
   &PREFACE;
   
   <part id="usage">
-    <title>Kom i gang med Evolution 1.0</title>
+    <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 i tillegg til styring av avtaler
-        og oppgaver. Du vil etterhvert finne ut at det er flere måter
+	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>
@@ -93,20 +96,21 @@ implemented. -->
     &USAGE-SYNC; 
     &USAGE-PRINT;
   </part>
+
   <part id="config">
-  <title>Konfigurasjon og håndtering av Evolution</title>
+  <title>Konfigurasjon og håndtering av Ximian Evolution</title>
     <partintro>
       <para>
-        <application>Evolution</application> er meget konfigurerbart.
+        <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 funksjonelt system. I tilfellet med
-        <application>Evolution</application>, betyr "konfigurerbart", 
+        "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 bedre.
+        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 veiviser for oppsett til en omvisning i dialoger for
+        glimt av assistenten for oppsett til en omvisning i dialoger for
         brukervalg som går mer i dybden.
       </para>
     </partintro>
@@ -115,18 +119,8 @@ implemented. -->
     &CONFIG-SYNC;
   </part>
 
-  <part>  
-    <title>Utfyllende menyreferanse</title>
-    <partintro>
-      <para>
-        Den følgende referansen dekker alle, eller nesten alle
-        menyer og menykommandoer som
-        <application>Evolution</application> har å tilby deg.
-      </para>
-    </partintro>
-    &MENUREF;
-  </part>
-  &FAQ;
+<!-- &FAQ; Just link to the webpage -->
+  &MENUREF;
   &APX-GLOSS;
   &APX-BUGS;
   &APX-AUTHORS; 
diff --git a/help/no/menuref.sgml b/help/no/menuref.sgml
index bc5008f68d..340a408847 100644
--- a/help/no/menuref.sgml
+++ b/help/no/menuref.sgml
@@ -41,8 +41,27 @@
       <para>
           <variablelist>
 
+
 	  <varlistentry>
-	    <term>Create a new folder</term>
+	    <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>
@@ -57,7 +76,7 @@
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term>Create a new Shortcut in the Evolution Bar</term>
+	    <term>Create a new Shortcut in the Evolution Bar:</term>
 	    <listitem>
 	      <para>       
                   <menuchoice><guimenu>File</guimenu>
@@ -89,7 +108,7 @@
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term>Create a new Appointment</term>
+	    <term>Create a new Appointment:</term>
 	    <listitem>
 	      <para>       
                   <menuchoice><guimenu>File</guimenu>
@@ -106,7 +125,7 @@
 
 
 	  <varlistentry>
-	    <term>Enter a new Contact</term>
+	    <term>Enter a new Contact:</term>
 	    <listitem>
 	      <para>       
                   Double-click in any blank space in the contact
@@ -125,7 +144,7 @@
 	  </varlistentry>
 
 	  <varlistentry>
-	    <term>Create a new Task</term>
+	    <term>Create a new Task:</term>
 	    <listitem>
 	      <para>       
                   <menuchoice><guimenu>File</guimenu>
@@ -152,7 +171,7 @@
 
   
         <varlistentry>
-	    <term>Send and Receive Mail</term>
+	    <term>Send and Receive Mail:</term>
 	    <listitem>
 	      <para>
                 Press <keycap>F9</keycap>, click the
@@ -164,19 +183,19 @@
 	    </listitem>
 	  </varlistentry>
         <varlistentry>
-	    <term>Navigating the Message List with the Keyboard</term>
+	    <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 message.
+                and down along the list of all messages.
                 </para>
 	    </listitem>
 	  </varlistentry>
 
           <varlistentry>
-	    <term>Move the display up and down in the preview pane</term>
+	    <term>Move the display up and down in the preview pane:</term>
 	    <listitem>
 	      <para>
                 Press the space bar to go a page down.  Press
@@ -186,7 +205,7 @@
 	  </varlistentry>
 
           <varlistentry>
-	    <term>Reply to a Message</term>
+	    <term>Reply to a Message:</term>
 	    <listitem>
 	      <para>
                 To reply to the sender of the message only:
@@ -211,7 +230,7 @@
 	  </varlistentry>
 	  
           <varlistentry>
-	    <term>Forward a Message</term>
+	    <term>Forward a Message:</term>
 	    <listitem>
 	      <para>
                 Select the message or messages you want to forward,
@@ -226,7 +245,7 @@
 	  </varlistentry>
 
           <varlistentry>
-	    <term>Open a Message in a New Window</term>
+	    <term>Open a Message in a New Window:</term>
 	    <listitem>
 	      <para>
                 Double-click the message you want to view, or select
@@ -240,7 +259,7 @@
 	  </varlistentry>
 	  
           <varlistentry>
-	    <term>Create Filters and Virtual Folders</term>
+	    <term>Create Filters and Virtual Folders:</term>
 	    <listitem>
 	      <para>
                 Right-click on a message and select
@@ -253,7 +272,7 @@
 
 
           <varlistentry>
-	    <term>Add Sender to Address Book</term>
+	    <term>Add Sender to Address Book:</term>
 	    <listitem>
 	      <para>
                 Right-click on a message and select <guimenuitem>Add
@@ -273,6 +292,39 @@
       <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>
@@ -292,15 +344,12 @@
         </para>
   </sect1>
     <sect1 id="quickref-contact">
-        <title>Contact Manager</title>
+        <title>Addressbook</title>
         <para>
-	Here are the most frequent tasks that are done in the Contact Manager,
-	with the shortcuts so that you can use these tasks without having to use
-	your mouse:
-
+	Here are shortcuts for the most frequent addressbook actions:
         <variablelist>
 	  <varlistentry>
-	    <term>Edit a Contact</term>
+	    <term>Edit a Contact:</term>
 	    <listitem>
 	      <para>
 		You can edit a contact two ways:
@@ -324,7 +373,7 @@
 	
 	<variablelist>
 	  <varlistentry>
-	    <term>Deleting a Contact</term>
+	    <term>Deleting a Contact:</term>
 	    <listitem>
 	      <para>
 		Right click on a contact and click <guilabel>Delete</guilabel>
@@ -338,7 +387,7 @@
 	
         <variablelist>
 	  <varlistentry>
-	    <term>Email a Contact</term>
+	    <term>Email a Contact:</term>
 	    <listitem>
 	      <para>
 		Right click on a contact and select 
@@ -350,7 +399,7 @@
 	
         <variablelist>
 	  <varlistentry>
-	    <term>Creating a New Contact</term>
+	    <term>Creating a New Contact:</term>
 	    <listitem>
 	      <para>
                   Double-click in any blank space in the contact
diff --git a/help/no/preface.sgml b/help/no/preface.sgml
index 839dbdcb93..9637beaf4c 100644
--- a/help/no/preface.sgml
+++ b/help/no/preface.sgml
@@ -8,7 +8,7 @@
       <para>
         This book is divided into two parts, with several
         appendices. The first part is a <link linkend="usage">guided
-        tour</link>&mdash; it will explain how to use
+        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
@@ -26,7 +26,7 @@
           <simplelist>
 	    <member><application>Applications</application></member>
 	    <member><command>Commands</command> you type at the command line</member>
-	    <member><guilabel>Labels</guilabel> for </member>
+	    <member><guilabel>Labels</guilabel> for buttons and other portions of the graphical interface</member>
 
             <member> Menu selections look like this:
                        <menuchoice>
@@ -42,25 +42,39 @@
 	  <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>Example Tip</title>
+	      <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. 
+	      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.
+		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>
diff --git a/help/no/topic.dat b/help/no/topic.dat
index ff72606879..6e9afad2ef 100644
--- a/help/no/topic.dat
+++ b/help/no/topic.dat
@@ -1,10 +1,10 @@
-index.html   Innholdsfortegnelse
+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 kontakthåndtereren
+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 Ordbok
\ No newline at end of file
+apx-gloss.html Ordliste
diff --git a/help/no/usage-calendar.sgml b/help/no/usage-calendar.sgml
index 41a5abd2b7..4a1745e55a 100644
--- a/help/no/usage-calendar.sgml
+++ b/help/no/usage-calendar.sgml
@@ -8,8 +8,7 @@
      <para>
       This chapter will show you how to use the Ximian Evolution
       Calendar to manage your schedule alone or in conjunction with
-      others.
-<!-- Others what? -->
+      peers.
      </para>
 
     <sect1 id ="usage-calendar-view"> 
@@ -41,19 +40,20 @@
 
       Press the calendar-shaped buttons on the right side of the toolbar to
       switch between views. 
-<!--QUESTION What does the following mean?  I can't find this functionality -->
+
       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.
+      &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,
-       month, fortnight, or anything else, you'll move around by just
-       that much. To come back to today's listing, click
-       <guibutton>Today</guibutton>.
+       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
@@ -79,7 +79,7 @@
 	  <guisubmenu>New</guisubmenu> 
 	  <guimenuitem>Appointment</guimenuitem>
 	</menuchoice>
-	or click the <guibutton>New</guibutton> button on the left end
+	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.
@@ -107,6 +107,33 @@
         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>
@@ -118,12 +145,12 @@
          </para>
       </note>
       <para>
-         You can have as many as four different
+         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>
+	    <term><guilabel>Display:</guilabel></term>
 	    <listitem>
 	      <para>
 	        A window will pop up on your screen to remind you of
@@ -132,7 +159,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry> 
-	    <term><guilabel>Audio</guilabel></term>
+	    <term><guilabel>Audio:</guilabel></term>
 	    <listitem>
 	      <para>
 	        Choose this to have your computer deliver a sound
@@ -141,7 +168,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term><guilabel>Program</guilabel></term>
+	    <term><guilabel>Program:</guilabel></term>
 	    <listitem>
 	      <para>
 	        Select this if you would like to run a program as a
@@ -151,16 +178,6 @@
               </para>
 	    </listitem>
 	  </varlistentry>
-	  <varlistentry>
-	    <term><guilabel>Mail</guilabel></term>
-	    <listitem>
-	      <para>
-	         <application>Evolution</application> will send an
-	         email reminder to the address you enter into the text
-	         field.
-              </para>
-	    </listitem>
-	  </varlistentry>
 	</variablelist>
 	    
       </para>
@@ -174,6 +191,12 @@
          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
@@ -230,50 +253,44 @@
     <sect2 id="usage-calendar-rsvp">
       <title>Sending an RSVP with the Calendar</title>
       <para>
-	<application>Evolution</application> can be used to setup group appointments
-	and help you manage RSVPs.
+	<application>Evolution</application> can be used to schedule
+	group meetings and help you manage responses to meeting
+	requests.
       </para>
       <para>
-	When you setup a gathering, you can specify people to come in numerous
-	positions, such as chair.  They are sent an email which lets them
-	easily reply to you with their response.  If they aren't sure if they
-	can attend, they can always reply to the mail later.
+	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 select receipients to be invited to an event:
+	To schedule a meeting:
 	<orderedlist numeration="arabic">
 	  <listitem>
 	    <para>
-	      Click
+	      Select
 	      <menuchoice>
-		<guimenu>Actions</guimenu>
-		<guimenuitem>Schedule Meeting</guimenuitem>
-	      </menuchoice>.  The <guilabel>Scheduling</guilabel> and <guilabel>Meeting</guilabel> tab open.
+		<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 identities setup, select the identity to use in the <guilabel>Sent By</guilabel> field.
+	      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 in the white box.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>Invite Others</guibutton>.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	    Select a person in the <guilabel>Contacts</guilabel> field and click one of the four choices to move them to be an RSVP reciever.
-	    </para>
-	  </listitem>
-	  <listitem>
-	    <para>
-	      Click <guibutton>OK</guibutton>.
+	      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>
@@ -286,9 +303,13 @@
       </para>
     </sect2>
     <sect2 id="replying-to-rsvp">
-      <title>Replying to an RSVP</title>
+      <title>Replying to a Meeting Request</title>
       <para>
-	If you recieve an RSVP, the RSVP will be attached as an ical file.  Click on the attachment and view it inline.   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:
+	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>
@@ -297,7 +318,7 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Tentativly Accept
+	      Tentatively Accept
 	    </para>
 	  </listitem>
 	  <listitem>
@@ -306,14 +327,20 @@
 	    </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.
+	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>Recieving an RSVP Response</title>
+      <title>Getting Responses to Meeting Requests</title>
       <para>
-	Once you recieve an RSVP, you'll need to view it inline in the email.  Click the attachment and select <guibutton>View Inline</guibutton>.  At the bottom, you can choose an action.  Click <guibutton>OK</guibutton> to update your attendee list.
+	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>
 
@@ -381,11 +408,8 @@
     <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.  Tasks are colored and sorted by priority and
-       due-date (see <xref linkend="config-prefs"> for more
-       information), and are included with calendar data during
-       synchronization  with a hand-held device.  You can use the list
-       in a larger format by choosing the <guibutton>Tasks</guibutton>
+       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>
@@ -415,10 +439,10 @@
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
-	  <term><guilabel>Start Date</guilabel></term>
+	  <term><guilabel>Start Date:</guilabel></term>
 	  <listitem>
 	    <para>
-	      The date you intend to start working.  <!-- NOTE Check this please --> The item will not show up on the list until the start date.
+	      The date you intend to start working.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -433,7 +457,7 @@
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
-	  <term><guilabel>Classification</guilabel></term>
+	  <term><guilabel>Classification:</guilabel></term>
 	  <listitem>
 	    <para>
 	      Sets who will see it if your calendar is shared.
@@ -449,8 +473,7 @@
        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 select it and click
-       <guibutton>Edit</guibutton>.  You can delete items by selecting
+       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>
@@ -460,7 +483,46 @@
       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">
@@ -475,10 +537,9 @@
     <example>
       <title>Keeping Multiple Calendars</title>
       <para>
-        Keelyn, the office manager for a small company, has one
-        calendar for her own schedule.  On the local network, she
-        maintains one for the conference room, so people know when
-        they can schedule meetings.  Next to that, she maintains a
+        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.
@@ -491,9 +552,10 @@
 	<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.  Alarms, configuration, and display for
-       each calendar are separate from each other.
+       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
index 5a49602374..dc11b4bd0a 100644
--- a/help/no/usage-contact.sgml
+++ b/help/no/usage-contact.sgml
@@ -5,15 +5,19 @@
   <title>Working with Your Contacts</title>
       <para>
         This chapter will show you how to use the
-        <application>Evolution</application> address book to organize
+        <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 address book, see <xref
-        linkend="config-prefs-contact">.
+        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 address book is quite simple.
+       The toolbar for the addressbook is quite simple.
        <itemizedlist>
 	<listitem><para>
            Click <guibutton>New Contact</guibutton> to create a new card, or double-click 
@@ -155,15 +159,15 @@
 		</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 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>.
+		  <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>
@@ -177,7 +181,7 @@
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
-	  <term>Multiple Values for Fields</term>
+	  <term>Multiple Values for Fields:</term>
             <listitem>
 	      <para>
                 If you click on the downward pointing triangle buttons
@@ -333,22 +337,22 @@
   </sect1>
 
   <sect1 id="usage-contact-organize">
-    <title>Organizing your Address Book</title>
+    <title>Organizing your Addressbook</title>
     <para>
-       Organizing your address book is a lot like organizing your
+       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 address book does not allow Virtual Folders.  It
+       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 address book share an address, and you
+      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.
@@ -414,7 +418,7 @@
            many or as few categories as you like.
         </para>
 
-       <!-- FIXME: Feature Not Implemented
+       <!-- Feature Not Implemented
 	<para>
 
            If the master list of categories doesn't suit you, you can
@@ -486,9 +490,8 @@
            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 Contact
-           Manager and select <guimenuitem>Send Message to
-           List</guimenuitem>.
+           right-click on the list's address card in the Addressbook
+           and select <guimenuitem>Send Message to List</guimenuitem>.
         </para>
       </sect3>
 
@@ -502,11 +505,11 @@
     <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 address books, or maintain a shared set of
+       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 address books, people can avoid
+       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>
@@ -546,8 +549,7 @@
               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? -->
+              network directory.  You do this by dragging and dropping your desired contacts into the local contacts list.
 	  </para>
 	  </listitem>
 
@@ -586,42 +588,21 @@
       </para>
     </sect1>
 
-    <sect1 id="contact-automation-lists">
-      <title>Sending Mail to Categories of Contacts</title>
-      <para>
-	 You already know that when you are writing an email, you can
-	 address it to one or more people, and that
-	 <application>Evolution</application> will fill in addresses
-	 from your address book's address cards if you let it.  In
-	 addition to that, you can send email to everyone in a
-	 particular group if you choose.
-      </para>
-
-<!-- FIXME this feature not yet implemented 
-
+<!-- Unimplemented features:
       <para>
-         You can also use the address book to print postal addresses
+         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>
- -->
-
-    </sect1>
-
-    <!---  FIXME this feature not yet implemented 
-  <sect1 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.
+    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>
-  </sect2>
-    -->
+  -->
     
     
 
diff --git a/help/no/usage-exec-summary.sgml b/help/no/usage-exec-summary.sgml
index be59cb389d..e16da21579 100644
--- a/help/no/usage-exec-summary.sgml
+++ b/help/no/usage-exec-summary.sgml
@@ -2,10 +2,10 @@
 <!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN">
 -->
 <chapter id="usage-summary">
-  <title>Using the Ximian Evolution Summary</title>
+  <title>Getting Oriented with the Ximian Evolution Summary</title>
   
   <sect1 id="summary-intro">
-    <title>Introducing the Summary</title>
+    <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
@@ -28,8 +28,7 @@
 	</listitem>
 	<listitem>
 	  <para>
-	    Your mail summary, showing you how many new emails are
-	    waiting in selected mail boxes.
+	    Mail summary
 	  </para>
 	</listitem>
 	<listitem>
@@ -185,7 +184,11 @@
 	  <title>Metric or Imperial?</title>
 	  <para>
 	    <application>Evolution</application> supports both
-	    Imperial and Metric measurement for weather reports.
+	    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>
diff --git a/help/no/usage-mail-org.sgml b/help/no/usage-mail-org.sgml
index 746beed0b0..ce6f75e69c 100644
--- a/help/no/usage-mail-org.sgml
+++ b/help/no/usage-mail-org.sgml
@@ -9,7 +9,186 @@
       to help you do it.
     </para>
 
-    <sect1 id="usage-mail-organize-columns">
+  <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
@@ -45,21 +224,21 @@
 	options:
 	<variablelist>	  
 	<varlistentry>
-	  <term><guimenuitem>Sort Ascending</guimenuitem></term>
+	  <term><guimenuitem>Sort Ascending</guimenuitem>:</term>
 	  <listitem><para>
 	      Sorts the messages top to bottom.
 	    </para></listitem>
 	</varlistentry>
 	  
 	  <varlistentry>
-	    <term><guimenuitem>Sort Descending</guimenuitem></term>
+	    <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>
+	    <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
@@ -69,7 +248,7 @@
 	  
 	  <varlistentry>
 	    <term><guimenuitem>Remove this
-		Column</guimenuitem></term> <listitem><para> Remove
+		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>
@@ -77,7 +256,7 @@
 	  
 	  <varlistentry>
 	    <term><guimenuitem>Field
-		Chooser</guimenuitem></term> <listitem><para> 
+		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
@@ -131,7 +310,7 @@
 	right below the toolbar, and choose a search type:
 	<variablelist>
 	  <varlistentry>
-	    <term><guilabel>Body or subject contains</guilabel></term>
+	    <term><guilabel>Body or subject contains</guilabel>:</term>
 	  <listitem>
 	      <para>
 	        This will search message subjects and the messages
@@ -141,7 +320,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term> <guilabel>Body contains</guilabel> </term>
+	    <term> <guilabel>Body contains</guilabel>:</term>
 	    <listitem>
 	      <para>
 	        This will search only in message text, not the subject
@@ -150,7 +329,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term><guilabel>Subject contains</guilabel></term>
+	    <term><guilabel>Subject contains:</guilabel></term>
 	    <listitem>
 	      <para>
 	        This will show you messages where the search text is
@@ -160,7 +339,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term><guilabel>Body does not contain</guilabel></term>
+	    <term><guilabel>Body does not contain:</guilabel></term>
 	    <listitem>
 	      <para>
 	        This finds every email message that does not have the
@@ -171,7 +350,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term><guilabel>Subject does not contain</guilabel></term>
+	    <term><guilabel>Subject does not contain:</guilabel></term>
 	    <listitem>
 	      <para>
 	        This finds every mail whose subject does not contain
@@ -342,13 +521,25 @@
 		  <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.
+		    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>
 		
@@ -436,16 +627,27 @@
       <example id="filter-example">
          <title>Using a Filter to Avoid Spam</title>
          <para>
-           The majority of bulk mail is tagged with the
+           A good deal of bulk mail is eventually tagged with the
            <computeroutput>Precedence: Bulk</computeroutput> header at
-           one point or another.  Some of these messages, of course,
-           could be in mailing lists you've subscribed to, but many of
-           them are unsolicited commercial email.  
+           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 put them all in one place, create a
-           new filter for incoming mail. Then:
+           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>
@@ -469,17 +671,15 @@
                folder where you'd like to place bulk mail.
              </para></listitem>
 
-             <listitem><para>
-               If you like, add an action and choose <guilabel>Stop
-               Processing</guilabel> if you'd like this message to be
-               ignored by all other filters.
-             </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>
+             </para></listitem>
 	   </orderedlist>
-	 </para>
+         </para>
       </example>
     </sect2>
 
@@ -495,7 +695,7 @@
 	      Select
 	      <menuchoice>
 		<guimenu>Tools</guimenu>
-		<guimenu>Filters</guimenu>
+		<guimenuitem>Filters</guimenuitem>
 	      </menuchoice>
 	    </para>
 	  </listitem>
@@ -608,12 +808,14 @@
 
 
     <note id="unmatched-vfolder">
-      <title>The Unmatched vFolder</title>
+      <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.
+	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>
 
@@ -792,17 +994,17 @@
 		  </para>
 		</listitem>
 	      </itemizedlist>
-	 
-	    </para>
-	  </listitem>
-	  <listitem>
-	<para>
-	        If you want multiple criteria for this filter, press <guibutton>Add
-		criterion</guibutton> and repeat the previous step.
-	    </para>
-	  </listitem>
-    </orderedlist>
-
+	
+         </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>
@@ -816,29 +1018,4 @@
       </para>
     </sect2>
   </sect1>
-  <!--
-    <sect1 id="usage-mail-subscriptions">
-      <title>Subscription Management</title>
-      <para>
-         <application>Ximian 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>
-  </sect1>
--->
 </chapter>
diff --git a/help/no/usage-mail.sgml b/help/no/usage-mail.sgml
index b78a9edcb4..2a1958805e 100644
--- a/help/no/usage-mail.sgml
+++ b/help/no/usage-mail.sgml
@@ -1,4 +1,3 @@
-
 <chapter id="usage-mail">
   <title>Using Evolution for Email</title>
   <para>
@@ -309,7 +308,7 @@
      <sect2 id="usage-mail-getnsend-get-attach">
 	 <title>Working with Attachments and HTML Mail</title>
 	 <para>
-	   If someone sends you an <glossterm>attachment</glossterm>,
+	   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,
@@ -376,12 +375,11 @@
       <title>Inline Images in HTML Mail</title>
       <para>
          When someone sends you HTML mail that includes an image in
-         the body of the message&mdash; like the welcome message in
-         your Inbox when you first started <application>Ximian
-         Evolution</application>&mdash;
-         <application>Evolution</application> will display the image
-         inside the message.  You can create messages like this by
-         using the
+         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>
@@ -718,8 +716,8 @@
           <para>
             Alternately, you can click on the
             <guibutton>To:</guibutton>, <guibutton>Cc:</guibutton>, or
-            <guibutton>Bcc:</guibutton> buttons to get a list &mdash;
-            potentially a very long one &mdash; of the email addresses
+            <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.
@@ -833,7 +831,7 @@
         <para>
            <variablelist>
             <varlistentry>
-              <term><guimenuitem>Find</guimenuitem></term>
+              <term><guimenuitem>Find:</guimenuitem></term>
               <listitem><para> Enter a word or phrase, and
               <application>Evolution</application> will find it
               in your message.
@@ -841,7 +839,7 @@
             </varlistentry>
 
             <varlistentry>
-              <term><guimenuitem>Find Regex</guimenuitem></term>
+              <term><guimenuitem>Find Regex:</guimenuitem></term>
               <listitem>
                 <para>
                   Find a regex, also called a
@@ -852,14 +850,14 @@
             </varlistentry>
 
             <varlistentry>
-              <term><guimenuitem>Find Again</guimenuitem></term>
+              <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>
+               <term><guimenuitem>Replace:</guimenuitem></term>
                <listitem><para>
                  Find a word or phrase, and replace it with
                  something else.
@@ -928,7 +926,7 @@
             into four categories:
             <variablelist>
              <varlistentry>
-             <term>Headers and lists</term>
+             <term>Headers and lists:</term>
               <listitem>
                 <para>
                   At the left edge of the toolbar, you can choose
@@ -944,7 +942,7 @@
               </listitem>
            </varlistentry>
 	  <varlistentry>
-	    <term>Text style</term>
+	    <term>Text style:</term>
 	    <listitem>
 	      <para>
 		Use these buttons to determine the way your letters
@@ -962,7 +960,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-              <term>Alignment</term>
+              <term>Alignment:</term>
 	    <listitem>
 	      <para>
 		Located next to the text style buttons, these three
@@ -976,7 +974,7 @@
 	  </varlistentry>
 
             <varlistentry>
-              <term>Indentation rules</term>
+              <term>Indentation rules:</term>
               <listitem>
                 <para>
                   The button with the arrow pointing left will reduce
@@ -987,7 +985,7 @@
           </varlistentry>
 
             <varlistentry>
-              <term>Color Selection</term>
+              <term>Color Selection:</term>
               <listitem>
                 <para>
                   At the far right is the color section tool.  The
@@ -1009,7 +1007,7 @@
            spruce up your email to make it more interesting:
 	<variablelist>
 	  <varlistentry>
-	    <term><guimenuitem>Link</guimenuitem></term>
+	    <term><guimenuitem>Link:</guimenuitem></term>
 	    <listitem>
 	      <para>
 		Lets you link some text to a website.  Use this tool to put hyperlinks in your HTML
@@ -1047,7 +1045,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term><guimenuitem>Image</guimenuitem></term>
+	    <term><guimenuitem>Image:</guimenuitem></term>
 	    <listitem>
 	      <para>
 		Lets you put an image alongside text.
@@ -1094,7 +1092,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term><guimenuitem>Rule</guimenuitem></term>
+	    <term><guimenuitem>Rule:</guimenuitem></term>
 	    <listitem>
 	      <para>
 		Inserts a horizontal line into the text to help divide two
@@ -1154,7 +1152,7 @@
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
-	    <term>Table</term>
+	    <term>Table:</term>
 	    <listitem>
 	      <para>
 		Inserts a table into the text to help divide two
@@ -1583,7 +1581,7 @@
   Your options are:
       <variablelist>
 	<varlistentry>
-	  <term>Accept</term>
+	  <term>Accept:</term>
 	  <listitem>
 	    <para>
 	  Select this entry if you will attend the meeting.  When you
@@ -1594,7 +1592,7 @@
 	</varlistentry>
 
 	<varlistentry>
-	  <term>>Accept</term>
+	  <term>Tentatively Accept:</term>
 	  <listitem>
 	    <para>
 	  Select this entry if you will probably attend the meeting.
@@ -1606,7 +1604,7 @@
 	</varlistentry>
 
 	<varlistentry>
-	  <term>Decline</term>
+	  <term>Decline:</term>
 	  <listitem>
 	    <para>
 	  Select this item if you will be unable to attend the
@@ -1619,7 +1617,7 @@
 	</varlistentry>
 
 	<varlistentry>
-	  <term>RSVP</term>
+	  <term>RSVP:</term>
 	  <listitem>
 	    <para>
 	     Check this box if you would like your response sent to
@@ -1635,13 +1633,16 @@
     <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.
+      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>
-      To use it:
+    Here's how:
       <orderedlist numeration="arabic">
 	
 	<listitem>
@@ -1711,7 +1712,7 @@
 	    ever</emphasis>.  Your private key lets you decrypt any
 	    message encrypted with your public key.
 	  </para>
-	</note>
+ 	</note>
 
       <para>
         Using encryption takes a bit of forethought.  When you send a
diff --git a/help/no/usage-mainwindow.sgml b/help/no/usage-mainwindow.sgml
index 7794c8c54f..b7ff02ecf7 100644
--- a/help/no/usage-mainwindow.sgml
+++ b/help/no/usage-mainwindow.sgml
@@ -103,22 +103,22 @@
 	<itemizedlist>
 	  <listitem>
 	    <para>
-	      Full Name &mdash; Your full name (Example: John Doe).
+	      Full Name: Your full name (Example: John Doe).
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Email Address &mdash; Your email address (Example: john@doe.com)
+	      Email Address: Your email address (Example: john@doe.com)
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Organization &mdash; The company where you work (optional).
+	      Organization: The company where you work (optional).
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Signature file &mdash; If you'd like to use an email
+	      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
@@ -138,35 +138,34 @@
 	<itemizedlist>
 	  <listitem>
 	    <para>
-	      Server Type &mdash; There are numerous types of servers
+	      Server Type: There are numerous types of servers
 	      from which <application>Ximian Evolution</application>
-	      can fetch your mail:
+	      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 &mdash; Downloads your email to your hard disk for
+		    POP: Downloads your email to your hard disk for
 		    permanent storage.
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    IMAPv4 &mdash; Keeps the email on your server so
-		    you can access your email from any computer that
-		    supports IMAPv4 and have everything be the
-		    same. For more information about how to use IMAP
-		    mail, see <xref
-		    linkend="usage-mail-subscriptions">.
+		    IMAP: Keeps the email on your server so you
+		    can access your email from multiple systems. 
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    Unix mail spool file &mdash; If you run a mail
-		    server on your desktop computer, choose this optino.
+		    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 &mdash; If you want
+		    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.
@@ -174,37 +173,57 @@
 		</listitem>
 		<listitem>
 		  <para>
-		    Qmail maildir format files &mdash; If you download your
+		    Qmail maildir format files: If you download your
 		    mail using qmail, you'll want to use this.
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    None &mdash; How do you  have None?  figure out!
+		    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 &mdash; This is the address of the server you're
+	      Email Server: This is the address of the server you're
 	      downloading from.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Username &mdash; The username that you login to your email.  That
+	      Username: The username that you login to your email.  That
 	      is often the part before the @ in your email.
 	    </para>
 	    <para>
-	      Authentication Type &mdash; Chances are you are using
-	      <guilabel>Password</guilabel>.  Ask your administrator for more
-	      details.  You can have <application>Ximian Evolution</application> check
-	      by clicking <guibutton>Check for supported types</guibutton>.
+	      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 &mdash; If you prefer to not enter your
+	      Remember Password: If you prefer to not enter your
 	      password every time you check email, press this button.
 	    </para>
 	  </listitem>
@@ -229,18 +248,18 @@
 	<itemizedlist>
 	  <listitem>
 	    <para>
-	      Server Type &mdash; There are numerous server types that
+	      Server Type: There are numerous server types that
 	      <application>Ximian Evolution</application> supports for sending your
 	      mail.
 	      <itemizedlist>
 		<listitem>
 		  <para>
-		    SMTP &mdash; Downloads mail into your mailbox file.
+		    SMTP: Downloads mail into your mailbox file.
 		  </para>
 		</listitem>
 		<listitem>
 		  <para>
-		    Sendmail &mdash; Uses another program to download your mail
+		    Sendmail: Uses another program to download your mail
 		    to your mailbox files.
 		  </para>
 		</listitem>
@@ -249,20 +268,20 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Host &mdash; If you chose SMTP, enter the server's name
+	      Host: If you chose SMTP, enter the server's name
 	      or IP address here.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Server requires authentication &mdash; If your server
+	      Server requires authentication: If your server
 	      requires you to enter a password to send mail, check
 	      this box.
 	    </para>
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Authentication Type &mdash; Chances are you are using
+	      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
@@ -272,14 +291,14 @@
 	  </listitem>
 	  <listitem>
 	    <para>
-	      Username &mdash; The account name you use when you login
+	      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 &mdash; If you prefer to not enter
+	      Remember Password: If you prefer to not enter
 	      your password every time you check email, press this
 	      button.
 	    </para>
@@ -291,35 +310,43 @@
   <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 <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>
+	    <term>VCard (.vcf, gcrd):</term>
 	    <listitem>
 	      <para>
-	         The most common addressbook format.
+	         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>Outlook Express 4 (.mbx)</term>
+	    <term>Microsoft Outlook Express 4 (.mbx):</term>
 	    <listitem>
 	      <para>
-                 Email file format used by Outlook Express 4.
+                 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>
+	    <term>MBox (mbox):</term>
 	    <listitem>
 	      <para>
 	       The email box format used by Mozilla, Netscape,
@@ -331,11 +358,13 @@
 </para>
 <para>
     <note>
-      <title>Outlook 2000 Users</title>
+      <title>Microsoft Outlook and Outlook Express Users</title>
       <para>
-	Outlook 2000 uses a proprietary format that
-	<application>Ximian Evolution</application> cannot import directly.
-	To import files from Outlook 2000, do the following:
+	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>
@@ -356,8 +385,8 @@
 	<listitem>
 	<para>
 	  Use the <application>Ximian Evolution</application> import
-          tool to import the files.  Read the FAQ at the Ximian
-          website for more information.
+          tool to import the files.  There's more information about
+          why this works, and how, at the Ximian support website.
       </para>
         </listitem>
      </orderedlist>
@@ -456,7 +485,7 @@
     
     <para>
       <inlinemediaobject><imageobject><imagedata  fileref="figures/full-5" format="png"></imageobject></inlinemediaobject>
-      <guilabel>Search Tools</guilabel>
+      <guilabel>Search Tool</guilabel>
     </para>
     
     <para>
@@ -484,7 +513,7 @@
 
 	    <variablelist>
 	      <varlistentry>
-		<term> <guibutton>Summary</guibutton></term>
+		<term> <guibutton>Summary</guibutton>:</term>
 		<listitem>
 	    <para>
 		    Start your day here.  The Ximian Evolution
@@ -498,7 +527,7 @@
 	      </varlistentry>
 
 	<varlistentry>
-	  <term> <guibutton>Inbox</guibutton></term>
+	  <term> <guibutton>Inbox</guibutton>:</term>
 	  <listitem>
 	    <para>
 	      Click the <guibutton>Inbox</guibutton> button to start
@@ -510,7 +539,7 @@
 	</varlistentry>
 
 	<varlistentry>
-	  <term><guibutton>Calendar</guibutton></term>
+	  <term><guibutton>Calendar</guibutton>:</term>
 	  <listitem>
 	    <para>
 	      The Calendar can store your appointments and task lists
@@ -521,7 +550,7 @@
 	</varlistentry>
 
        <varlistentry>
-         <term><guibutton>Tasks</guibutton></term>
+         <term><guibutton>Tasks</guibutton>:</term>
 	<listitem>
 	  <para>
 	     A full-size view of your calendar's task pad.
@@ -530,11 +559,11 @@
       </varlistentry>
 
 	<varlistentry>
-	  <term><guibutton>Contacts</guibutton></term>
+	  <term><guibutton>Contacts</guibutton>:</term>
 	  <listitem>
 	    <para>
-	      The Contact Manager holds your addresses, phone numbers,
-	      and contact information.  Like calendar information,
+	      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>
@@ -569,7 +598,7 @@
       <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>&mdash; it starts small at the top, and branches
+      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
@@ -637,12 +666,11 @@
     <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 <keycap>Tab</keycap> 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.
+         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>
 
@@ -764,7 +792,7 @@
    <para>
       <variablelist>
         <varlistentry>
-          <term> <guimenu>File</guimenu></term>
+          <term> <guimenu>File</guimenu>:</term>
 
           <listitem><para> Anything related to a file or to the
             operations of the application generally falls under this
@@ -773,7 +801,7 @@
         </varlistentry>
 
        <varlistentry>
-          <term> <guimenu>Edit</guimenu></term>
+          <term> <guimenu>Edit</guimenu>:</term>
           <listitem><para>
               The <guimenu>Edit</guimenu> menu holds
               useful tools that help you edit text and move it around.
@@ -781,7 +809,7 @@
         </varlistentry>
 
        <varlistentry>
-          <term> <guimenu>View</guimenu></term>
+          <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 
@@ -791,17 +819,17 @@
         </varlistentry>
 
         <varlistentry>
-          <term> <guimenu>Actions</guimenu></term>
+          <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 &mdash; for
-	    example, replying to a message &mdash; you can find it in
+	    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>
+          <term> <guimenu>Tools</guimenu>:</term>
           <listitem><para>
              Tools for configuring, changing, and
           setting up preferences go here.  For mail, that means things like
@@ -814,7 +842,7 @@
         </varlistentry>
 
        <varlistentry>
-          <term> <guimenu>Help</guimenu></term>
+          <term> <guimenu>Help</guimenu>:</term>
           <listitem><para>
              Select among these items to open the 
              <application>Help Browser</application> 
@@ -845,9 +873,47 @@
       </para>
 
       <para>
-        FIXME: Insert picture of the Summary and labels here.
+<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
@@ -883,8 +949,8 @@
               It supports multiple mail sources, including <glossterm
               linkend="imap">IMAP</glossterm>, <glossterm
               linkend="pop">POP3</glossterm>, local
-              <filename>mbox</filename> and
-              <filename>mh</filename> files.
+              <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
@@ -940,11 +1006,11 @@
 
       <para>
         <inlinemediaobject><imageobject><imagedata  fileref="figures/full-2"
-        format="png"></imageobject></inlinemediaobject> <guilabel>Email List</guilabel>
+        format="png"></imageobject></inlinemediaobject> <guilabel>Message List</guilabel>
       </para>
     
       <para>
-        The <guilabel>Email List</guilabel> displays all the emails
+        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>
@@ -955,9 +1021,13 @@
         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.  Just like with
-        folders, you can right-click on messages in the message list and
-        get a menu of possible actions.
+        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
@@ -1048,16 +1118,14 @@
     <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.  Since
-        <application>Ximian 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.
+        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>
diff --git a/help/no/usage-notes.sgml b/help/no/usage-notes.sgml
index e9561065e6..1ff2283128 100644
--- a/help/no/usage-notes.sgml
+++ b/help/no/usage-notes.sgml
@@ -1,7 +1,7 @@
 <chapter id="usage-notes">
-  <title>Evolution notater</title>
+  <title>Evolution Notes</title>
   <abstract>
-    <title>En oversikt over notater i Evolution</title>
+    <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
diff --git a/help/no/usage-print.sgml b/help/no/usage-print.sgml
index ebce544b9a..e611b97b00 100644
--- a/help/no/usage-print.sgml
+++ b/help/no/usage-print.sgml
@@ -35,7 +35,7 @@
       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 the Mail, Calendar, or Contact Manager.
+      you want from your mail, calendar, or addressbook.
     </para>